Merge remote-tracking branch 'origin/bug-1229' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:13:47 +0000 (00:13 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:13:47 +0000 (00:13 +0100)
commitf0f37eabcb2554f78900396248a05cdee1626975
tree4ad9425a51d3dee2f7722ce51ebc8aeda2ebfbdd
parent9064664ed906768c99529a5144ee2bdb91123804
parent7317afcf82152676efc061d442b9adea3900ca4c
Merge remote-tracking branch 'origin/bug-1229' into release