Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:55:56 +0000 (15:55 -0800)
committerCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:55:56 +0000 (15:55 -0800)
commit5e841301dc2b8a673eb581705eeda979a423c37e
treedf980659defef5c2b5e7cc1a364c6147945fb000
parentd2d345ca3610a908fa3d4aead98e6e232b49c7ad
parent99dc1abaaf094ccf3f35965535818edd14f1640f
Merge branch 'master' into debian