Merge branch '2.1'
authorPetri Lehtinen <petri@digip.org>
Mon, 8 Aug 2011 18:00:47 +0000 (21:00 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 8 Aug 2011 18:00:47 +0000 (21:00 +0300)
commit910fb9226738c9f10964283c9aeadc240f0349f4
tree334678e9fe8ef273868624ffd704cb6632bdcf20
parent7e9c293986de8bcb88dbb4b8dfa155e4d2834ed6
parentf241e14cab9b664be4a9c9f187c1e71aa25fc30f
Merge branch '2.1'
doc/apiref.rst