Merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 12 Oct 2012 23:46:19 +0200
branchstable
changeset 1142 2a75107bd979
parent 1139 cdabdd17f980 (diff)
parent 1141 4e2090ed2e72 (current diff)
child 1143 38b7bb8f1c85
Merge with default