Merge branch 'bug-1244' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 16:03:56 +0000 (17:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 16:03:56 +0000 (17:03 +0100)
commit5476ac472c00936c1687541b4eb2b0a40f4eec79
tree2d21b900589253fabc11b6176331e327f186d703
parenta14c8f605894bf65ccb6f644703d16ecef2e474c
parentbfca83af2482ee02b5bbbb59a80a138e0157f3f5
Merge branch 'bug-1244' into release