Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 28 Nov 2013 12:59:05 +0000
changeset 1312 c44d24e2fc66
parent 1309 02972bce7d41 (diff)
parent 1311 1fed120bfa04 (current diff)
child 1314 48123437bbc5
Merge with stable