Merge tag 'upstream/1.4'
authorJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:01:37 +0000 (19:01 +0100)
committerJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:01:37 +0000 (19:01 +0100)
commit5e895d4146591e6a3418b68ae91627736059e5cd
treeadf5fc5b370a52db1a53e463d9ec6acf8ceeb6c2
parentdfd2456c041bd79615562cbcf98f88cd8a5023d3
parentf774d6d6c1268d1da6305b731fd96885e7763355
Merge tag 'upstream/1.4'

Upstream version 1.4