Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 06 Jun 2013 22:36:18 +0100
changeset 1264 b42c9f1d461a
parent 1262 f06138614934 (diff)
parent 1263 f31eefe0ab4c (current diff)
child 1271 181e420ff0ac
Merge with stable