Merge remote-tracking branch 'origin/bug-1122' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:24:47 +0000 (01:24 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:24:47 +0000 (01:24 +0200)
commitd26f9abb0a6e119250c42811e4b2f60aedf010a6
treea82530a945f5104e1a361db0557579c49dc9a2eb
parentbb07ff8c3a73e4846ef37aa8ddf4c6b195c4af89
parent145102ac00024ea88c7d5db6129aa79ffaaed040
Merge remote-tracking branch 'origin/bug-1122' into release
includes/general.php