Merge branch 'master' into master-experimental
authorDidier Raboud <odyx@debian.org>
Mon, 5 Mar 2012 21:55:21 +0000 (22:55 +0100)
committerDidier Raboud <odyx@debian.org>
Mon, 5 Mar 2012 21:55:21 +0000 (22:55 +0100)
commit469a0a4bacd5431b7352653accdea83f60ae1b67
tree22331061ca3d4927ccddfa7a12aaf645b1b9957c
parente4feb63d859944c02108b624ca43d66ab9a0d9c8
parent30aa403a25f492e7b9d62db0b499c3514683c946
Merge branch 'master' into master-experimental