Merge branch 'maint'
commit1358c62ee728021822eadb8c09eeea660b0cabc9
authorAchim Gratz <Stromeko@Stromeko.DE>
Tue, 29 Jul 2014 20:12:22 +0000 (29 22:12 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Tue, 29 Jul 2014 20:12:22 +0000 (29 22:12 +0200)
tree146fcab9b319fae77473281c52de4e2168c2fa0f
parent547f6ee541f6d2394aa82d3ae0e8ce89ccbbdb1f
parent3f67b185ccfd3d443e43cef2be3ea586ece7c3b9
Merge branch 'maint'