[pypy-commit] extradoc extradoc: hg merge

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: extradoc
Changeset: r3648:e2dc3a419c2a
Date: 2011-06-12 11:43 +0200
http://bitbucket.org/pypy/extradoc/changeset/e2dc3a419c2a/

Log:	hg merge

diff --git a/talk/icooolps2011/paper.tex b/talk/icooolps2011/paper.tex
--- a/talk/icooolps2011/paper.tex
+++ b/talk/icooolps2011/paper.tex
@@ -93,9 +93,9 @@
            {cfbolz at gmx.de \and anto.cuni at gmail.com \and fijal at merlinux.eu \and
            leuschel at cs.uni-duesseldorf.de \and samuele.pedroni at gmail.com \and arigo at tunes.org}
 
-\conferenceinfo{ICOOOLPS}{'11 Lancaster, UK}
+\conferenceinfo{ICOOOLPS'11,}{July 26, 2011, Lancaster, UK.}
 \CopyrightYear{2011}
-\crdata{XXX}
+\crdata{978-1-4503-0894-6/11/07}
 
 \maketitle