Merge branch 'bug-1218' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 15:50:30 +0000 (16:50 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 15:50:30 +0000 (16:50 +0100)
commita14c8f605894bf65ccb6f644703d16ecef2e474c
tree9c53a1a4d9a893b76921ecf3848829dc51b20291
parentd810496e718e2545565e7b05687b763bdc628b92
parent036f7b674615b72ae0119a5f5a403f95fb7ad977
Merge branch 'bug-1218' into release