Merge commit 'local/master'
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 20:00:15 +0000 (22:00 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 26 Jun 2009 20:00:15 +0000 (22:00 +0200)
commit17a025d4b0e1665581aa57d7acb934f0fdea00e4
tree87b44c3b9d3e876ceb9a381641254e9a3f02e2e7
parente4dc2a0a10351d79db1d77c4b69850773f16e62e
parentcc69f46fdca6eb93d2a1e9c9a8641c2cbd240203
Merge commit 'local/master'