Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 08 Nov 2012 18:35:43 +0000
changeset 1156 337e1ceae82e
parent 1154 2498fa07212f (diff)
parent 1155 380eea1f5add (current diff)
child 1162 0928d50a0abe
Merge with stable