Merge remote-tracking branch 'origin/bug-977' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 10 Dec 2012 00:34:35 +0000 (01:34 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 10 Dec 2012 00:34:35 +0000 (01:34 +0100)
commit46af74ccb903b92ac6de768934a3faf8d2da45ea
tree341497556baac356e6aaeb5d14f8ba7b38ea29b2
parent4fb198eb799295a1dc849e1313ca2f465e6d18a9
parente8bdb071a9c4bc1bffc1cf06b789fa5b37a8dbe9
Merge remote-tracking branch 'origin/bug-977' into release