Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 14 Feb 2013 11:33:19 +0000
changeset 1217 09f857c44abe
parent 1213 1a87bd40517c (diff)
parent 1216 192cebcd59a0 (current diff)
child 1220 757cf8d4724b
Merge with stable