Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:39:25 +0000 (15:39 -0800)
committerCharles Clément <caratorn@gmail.com>
Wed, 17 Feb 2010 23:39:25 +0000 (15:39 -0800)
commitd2d345ca3610a908fa3d4aead98e6e232b49c7ad
treee27cd92d807e64bcd1a5507b371ae75d33742314
parentcd37e3117558eda80ec6611286a92abbc0c95858
parent3e2e40f9fe9a05539c49d00cd6b45f6213e6e6cd
Merge branch 'master' into debian