Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 14 Apr 2014 13:21:25 +0100
changeset 1371 3b0bcc658eef
parent 1367 b3bee8727631 (diff)
parent 1370 d6cab997a43e (current diff)
child 1373 7e193663b0d6
Merge with stable