Merge branch 'unstable' into alpha4
authorBogDan Vatra <bogdan@kde.org>
Mon, 17 Sep 2012 19:11:40 +0000 (22:11 +0300)
committerBogDan Vatra <bogdan@kde.org>
Mon, 17 Sep 2012 19:11:40 +0000 (22:11 +0300)
commit9f64c7bba9b7894a631422c852af2a305b7cf567
tree92cd9ad2aa31ee80163c9b7d78e47bcd6bb89386
parentb2f89cdbc95594e9e71c05f6c891ff1b5df3d9d8
parent7de47f1c9d4302a8b5a601ffcfb0b48d4358fa9e
Merge branch 'unstable' into alpha4