Merge remote branch 'basti-public/master'
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 5 Aug 2010 09:27:10 +0000 (11:27 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Thu, 5 Aug 2010 09:27:10 +0000 (11:27 +0200)
commit1634420d6ee6ce75fbb597491a0ef3b772430f37
tree30bd6573ff5c61357517528eb59df908282f7e8d
parent3358f1f81255f2069435377891e56e5d13301211
parent60c58c376857da37572671d1299bd5542cf2aef7
Merge remote branch 'basti-public/master'