Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 07 Oct 2013 13:51:33 +0100
changeset 1299 ce8024f27837
parent 1296 115d2b6a8a9c (diff)
parent 1298 d69c1db7cf8b (current diff)
child 1302 f103c0693fbb
Merge with stable