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)
Upstream version 2.1


Trivial merge