Merge tag 'upstream/1.6'
authorJulien Valroff <julien@kirya.net>
Sat, 14 Jul 2012 08:14:35 +0000 (10:14 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 14 Jul 2012 08:14:35 +0000 (10:14 +0200)
Upstream version 1.6


Trivial merge