Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 14 Jan 2014 15:51:15 +0000
changeset 1314 48123437bbc5
parent 1312 c44d24e2fc66 (diff)
parent 1313 2a1cad657b6d (current diff)
child 1322 95880c8fedb6
Merge with stable