Merge branch 'master' into debian
authorCharles Clément <caratorn@gmail.com>
Sat, 20 Feb 2010 23:33:41 +0000 (15:33 -0800)
committerCharles Clément <caratorn@gmail.com>
Sat, 20 Feb 2010 23:33:41 +0000 (15:33 -0800)
commit5ebdbde3d5af467001bad2e233d662fa4e4af39d
tree91af2167577d6e8e0294d34bade2ef1b8dcbcd48
parent94b59a92dfa8133d55ffe7a0ae6a76cd24aec341
parent513938eb61a8fa96bb3a64ef8006069097305f21
Merge branch 'master' into debian