Merge remote-tracking branch 'origin/bug-1236' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:06:56 +0000 (00:06 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:06:56 +0000 (00:06 +0100)
commit9064664ed906768c99529a5144ee2bdb91123804
tree8ab022b3f21531f36be9880ca7cc0b31857e72e1
parent7d088a2e2b1bd6ecb88bcf469c5891fc1f22a467
parent0fcd48bf0d49724ac747f00c0990e157df64b584
Merge remote-tracking branch 'origin/bug-1236' into release