Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 04 Jan 2013 20:12:31 +0000
changeset 1181 07a7aabca5ce
parent 1179 e4157fb1161d (diff)
parent 1180 68d1d29f6496 (current diff)
child 1185 5ac75dd311d5
Merge with stable