Merge branch 'doc' into wip
authorJean Privat <jean@pryen.org>
Thu, 17 Feb 2011 18:55:40 +0000 (13:55 -0500)
committerJean Privat <jean@pryen.org>
Thu, 17 Feb 2011 18:55:40 +0000 (13:55 -0500)
commit55814dcba3792240f5ff385bd40455514aab6bf4
tree8e56dd8e440000908bc2774be03b4292eacd2803
parentdf0c1879cc3e80537f01e454830cb131ea1e601f
parent8445282c4185d258e2177b91d265679b934e6cc5
Merge branch 'doc' into wip