Merge remote-tracking branch 'origin/bug-1135' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:30:39 +0000 (23:30 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:30:39 +0000 (23:30 +0100)
commita3470bf19516ac42a805315fa670164ea0ddbbc7
tree64622a80931bc7edda601ff39c382bc053dbc145
parentbeef667c8fc1dd6e41807732358174832d801ecf
parentb6da008fed38852b6e694261ce3e0324778f7535
Merge remote-tracking branch 'origin/bug-1135' into release