Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 01 Nov 2013 17:14:49 +0000
changeset 1302 f103c0693fbb
parent 1299 ce8024f27837 (diff)
parent 1301 761641fc16a6 (current diff)
child 1306 c8f3a433abe6
Merge with stable