Merge remote-tracking branch 'origin/bug-1237' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:46:53 +0000 (23:46 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:46:53 +0000 (23:46 +0100)
commit7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467
tree133d6e13173e7ce5de1746ebf54bbefd14b1275b
parenta3470bf19516ac42a805315fa670164ea0ddbbc7
parent5decb5e88224831cc6e8c5372f8eafc04cfbe23c
Merge remote-tracking branch 'origin/bug-1237' into release