Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 21 Dec 2012 15:21:55 +0000
changeset 1176 f301599e705a
parent 1167 ca46d3dccb19 (diff)
parent 1175 62cc0851c70f (current diff)
child 1179 e4157fb1161d
Merge with stable