Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 17 Jan 2014 15:32:21 +0000
changeset 1322 95880c8fedb6
parent 1314 48123437bbc5 (diff)
parent 1321 79f68c0ed71e (current diff)
child 1324 0af7748569a8
Merge with stable