Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 20 Nov 2013 12:26:54 +0000
changeset 1308 12c752c0a02b
parent 1306 c8f3a433abe6 (diff)
parent 1307 164ed9bf157c (current diff)
child 1309 02972bce7d41
Merge with stable