Merge remote-tracking branch 'origin/bug-596' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 12 Oct 2011 14:51:22 +0000 (16:51 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 12 Oct 2011 14:51:22 +0000 (16:51 +0200)
commit9fbc1a84044a2e7e04de6422d5ef1b6887b401a3
tree964a1071ee60b65047c6935b351706620b08c881
parent861f341531af7ad5ad2deba0e5f38487fc1b4ba5
parent93c32cf1f508bedd509ccc6fd2c64799b5a97eee
Merge remote-tracking branch 'origin/bug-596' into release