Merge branch 'upstream' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 17 Jul 2011 11:32:23 +0000 (13:32 +0200)
commit2a285ae952ebfd70bc30976b1201a76a0c609045
tree3d30cc6d0a8ab6842e75ed9cd041c5e05d083a2e
parent1dcd920cf18658d6c17c7b0793a9cba0b5bf919b
parentb18f91849b3436c44cbc4d7f54d69a801a7d8bd5
Merge branch 'upstream' into experimental