Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 03 Jun 2013 09:59:32 +0100
changeset 1262 f06138614934
parent 1225 19fe7b202b38 (diff)
parent 1261 13890d7a70b1 (current diff)
child 1264 b42c9f1d461a
Merge with stable