Merge commit 'upstream/1.2'
authorJulien Valroff <julien@kirya.net>
Fri, 30 Dec 2011 09:44:01 +0000 (10:44 +0100)
committerJulien Valroff <julien@kirya.net>
Fri, 30 Dec 2011 09:44:01 +0000 (10:44 +0100)
commit6c03b68b81c9a9ef9807965539c707789d144506
tree1760c02880134d31e668e07f491ecb52d4012449
parent49b0b4b0356b5871fff83a0b68acd4627f64cf50
parente78256327a17b5919d78c89068f0df38097582fe
Merge commit 'upstream/1.2'