Merge commit 'upstream/1.1'
authorJulien Valroff <julien@kirya.net>
Sat, 1 Oct 2011 11:11:34 +0000 (13:11 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 1 Oct 2011 11:11:34 +0000 (13:11 +0200)
commit4039e1f966ad367d74436983bbcf66d1720e5b6b
treedda7e5bfc5e05f2811c11899200c75ddd350db74
parent7f1490980585a0deab9758b859991f54ff42e4fd
parentabe74b361dbab8a6e79e561f8df29524def39afa
Merge commit 'upstream/1.1'