Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 14 Feb 2014 09:52:13 +0100
changeset 1333 90d2e5021063
parent 1328 7fb45860e267 (diff)
parent 1332 e307d04d3c4d (current diff)
child 1342 64c56144ce88
Merge with stable