Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 13 Jun 2013 19:37:59 +0100
changeset 1275 b4ecdf12956f
parent 1271 181e420ff0ac (diff)
parent 1274 f1a4e67c41fe (current diff)
child 1277 3fbd928acf60
Merge with stable