Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 19 Jan 2012 01:50:48 +0100
changeset 1040 15aa105f81e2
parent 1036 1321f8629e89 (diff)
parent 1039 7c2190b236cf (current diff)
child 1042 91e083fab1a3
Merge with stable