Merge tag '2012.2' into debian/experimental
authorMehdi Abaakouk <sileht@sileht.net>
Sat, 29 Sep 2012 07:21:04 +0000 (09:21 +0200)
committerMehdi Abaakouk <sileht@sileht.net>
Sat, 29 Sep 2012 07:21:04 +0000 (09:21 +0200)
2012.2


Trivial merge