Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 25 Apr 2011 23:09:47 +0100
changeset 917 6f25a5834e14
parent 911 f3ab526d8761 (diff)
parent 916 dd5c50a018b0 (current diff)
child 920 3881911c17b0
Merge with stable