Merge branch 'maint'
authorAchim Gratz <Stromeko@Stromeko.DE>
Wed, 7 Nov 2012 17:45:25 +0000 (18:45 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Wed, 7 Nov 2012 17:45:25 +0000 (18:45 +0100)
commitc149e04ade80f077379ecaaaa845f1ffae6f1448
tree3cda4b0dd0666da463d14140aa77a8d3b3dffb5e
parentc2ebeea6f68f2ef804d387c238e4acccf655dc64
parentca5d5e9c9b792f139362968de60b5a3cbf92064b
Merge branch 'maint'