Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 10 Jan 2013 16:02:08 +0000
changeset 1191 0cdba0354b87
parent 1185 5ac75dd311d5 (diff)
parent 1190 ecb744c2a199 (current diff)
child 1192 5eb5ba3b9e99
Merge with stable