Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 28 Nov 2012 23:59:39 +0000
changeset 1167 ca46d3dccb19
parent 1162 0928d50a0abe (diff)
parent 1166 d38c648869bb (current diff)
child 1176 f301599e705a
Merge with stable