Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 08 Nov 2011 18:13:53 +0000
changeset 1006 826681fc0976
parent 1004 b675519e2a5b (diff)
parent 1005 d86b26020b48 (current diff)
child 1007 4fad25af75dd
Merge with stable