Merge branch 'bug-1004' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:53:38 +0000 (13:53 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:53:38 +0000 (13:53 +0100)
commit2d0ac083b13979fedd6384b62bd0991d1fcb4d43
treee542ffcc45011c023560c1a43f0bf8f66415c29d
parentbe7573a378a88bdc8574a613a068097503f40d6d
parent848a171e8371dfa08fd2a880f6c4ddcdea8a8880
Merge branch 'bug-1004' into release