Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 21 Oct 2012 16:10:25 +0100
changeset 1154 2498fa07212f
parent 1147 95e6504e6e27 (diff)
parent 1153 d98134ae80ba (current diff)
child 1156 337e1ceae82e
Merge with stable