Merge commit 'upstream/0.2.8'
authorJulien Valroff <julien@kirya.net>
Fri, 7 May 2010 21:07:57 +0000 (23:07 +0200)
committerJulien Valroff <julien@kirya.net>
Fri, 7 May 2010 21:07:57 +0000 (23:07 +0200)
commit5e8fdc788bf16ea416bee6614f0a9cd6560dec15
treea0e8a76fa1a22544c7ecb58daa4d7555deb4f1da
parent554b0f3fc6f15d6902a2a6b19d8eb8c390f8af32
parente18977e11607e741aca861e689edadd9ec88085b
Merge commit 'upstream/0.2.8'