Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 10 Feb 2014 14:08:42 +0100
changeset 1326 89668f3ba3bc
parent 1324 0af7748569a8 (diff)
parent 1325 8caca8a82e37 (current diff)
child 1328 7fb45860e267
Merge with stable