Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Thu, 18 Feb 2010 00:32:38 +0000 (16:32 -0800)
committerCharles Clément <caratorn@gmail.com>
Thu, 18 Feb 2010 00:32:38 +0000 (16:32 -0800)
commit82bc11c0ae5f112e5455afe5d17c035476c4ed1a
treedc34f7329aec62dcd538ff5db4805966c52cbf64
parent5e841301dc2b8a673eb581705eeda979a423c37e
parentc0ca9dea8ba8625cb2c24294a34de106e75b51b5
Merge branch 'master' into debian