Merge branch 'maint'
commit9ab8cb1196f43b46f300e0b5aa9e79616ac4b4db
authorAchim Gratz <Stromeko@Stromeko.DE>
Sat, 29 Sep 2012 08:49:20 +0000 (29 10:49 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sat, 29 Sep 2012 08:49:20 +0000 (29 10:49 +0200)
tree344c787cd775d262296efade05325803235b85fe
parent6e61cfc80f7ac18bc89b3fd0cea23519eac6e78a
parente6228c448e84f64ced8c48d13aa13881466fae8d
Merge branch 'maint'