Merge tag 'upstream/1'
authorJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:00:26 +0000 (19:00 +0100)
committerJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:00:26 +0000 (19:00 +0100)
commitdfd2456c041bd79615562cbcf98f88cd8a5023d3
treeadf5fc5b370a52db1a53e463d9ec6acf8ceeb6c2
parenta407a6557b22bddc5c6f146e7c8f7dc6eac13ef1
parent5607ad68b53326326a42f839d729551c3f388fc5
Merge tag 'upstream/1'

Upstream version 1