[pypy-svn] extradoc extradoc: merge heads

[lac]

Author: Laura Creighton <lac at openend.se>
Branch: extradoc
Changeset: r3530:57d162f82fdb
Date: 2011-04-21 23:28 +0200
http://bitbucket.org/pypy/extradoc/changeset/57d162f82fdb/

Log:	merge heads

diff --git a/planning/hg-migration/pypy.org.filemap b/planning/hg-migration/pypy.org.filemap
new file mode 100644
--- /dev/null
+++ b/planning/hg-migration/pypy.org.filemap
@@ -0,0 +1,2 @@
+include pypy.org
+rename pypy.org .