Merge commit 'upstream/0.2.4'
authorJulien Valroff <julien@kirya.net>
Tue, 30 Mar 2010 17:44:09 +0000 (19:44 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 30 Mar 2010 17:44:09 +0000 (19:44 +0200)
commita1c29a117bf73c9af256002c794f91cd62c63f60
tree6e501b5551b44734b2a5e7aa6cf0e081a1d1141d
parent2d663c36266387b2b575ec655fd9d109019f1f6f
parentbb8b3affb6e5f36a4693f5070c52a900a561ce53
Merge commit 'upstream/0.2.4'