Merge remote-tracking branch 'origin/bug-1082' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:17:34 +0000 (01:17 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:17:34 +0000 (01:17 +0100)
commita179527ab6174bf81346af5640cab11d9f245966
treef6e9b6d5e1498f28a43a1bc803e4b07885d832e8
parentbe8f7fb541f322cb5350a61177ec6c2a3f4deb73
parent2519503420ca934e98c959d577e680e90e54b9e0
Merge remote-tracking branch 'origin/bug-1082' into release