Merge tag 'upstream/2.1' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 22 Dec 2012 00:30:20 +0000 (02:30 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sat, 22 Dec 2012 00:30:20 +0000 (02:30 +0200)
commitbd0b6dcef8f68fa1fa24adfdaa6df57c30baf94e
tree55663e0d6c19476c3cfb8fe66ad1ef5b4d4e9b3d
parent99dec6fe15f0928998f61a3b503d0f55ab6cccf4
parent5f03107095c0096083ec910e088bc5feaeafe5c8
Merge tag 'upstream/2.1' into experimental

Upstream version 2.1