Merge tag 'upstream/0.2'
authorClaudio Sacerdoti Coen <claudio@zenone.casamia.org>
Tue, 30 Apr 2013 16:58:09 +0000 (18:58 +0200)
committerClaudio Sacerdoti Coen <claudio@zenone.casamia.org>
Tue, 30 Apr 2013 16:58:09 +0000 (18:58 +0200)
UpstreamĀ versionĀ 0.2


Trivial merge