Author: Alex Gaynor <[email protected]>
Branch: extradoc
Changeset: r4144:0e2c2a1051e7
Date: 2012-03-09 15:13 -0800
http://bitbucket.org/pypy/extradoc/changeset/0e2c2a1051e7/

Log:    merge conflict?

_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to