Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 11 Feb 2014 22:50:56 +0100
changeset 1328 7fb45860e267
parent 1326 89668f3ba3bc (diff)
parent 1327 953d562c3ebf (current diff)
child 1333 90d2e5021063
Merge with stable