Merge commit 'upstream/0.2.10'
authorJulien Valroff <julien@kirya.net>
Wed, 26 May 2010 17:05:44 +0000 (19:05 +0200)
committerJulien Valroff <julien@kirya.net>
Wed, 26 May 2010 17:05:44 +0000 (19:05 +0200)
commit9dd3fe73838361a862340bdc76cf68410971f118
tree7f91c33660112bcde92917a5c2851d7d974cbadf
parent240eba4416ba208cbbd6af79ab099ae360670acd
parentf20f1791826bebe528a042e71dc9c6e46b70ef72
Merge commit 'upstream/0.2.10'