Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 11 Nov 2011 09:39:33 +0000
changeset 1021 4ecaec765d76
parent 1020 5dc5c899428a (diff)
parent 1019 e7fbd63e5a98 (current diff)
child 1023 c7a801067441
Merge with stable