Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 01 Jul 2013 14:19:04 +0100
changeset 1277 3fbd928acf60
parent 1275 b4ecdf12956f (diff)
parent 1276 509a9dd1553c (current diff)
child 1288 2e9c41125820
Merge with stable