Merge branch '2.1'
authorPetri Lehtinen <petri@digip.org>
Thu, 30 Jun 2011 18:48:51 +0000 (21:48 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 30 Jun 2011 18:48:51 +0000 (21:48 +0300)
1  2 
doc/apiref.rst

diff --cc doc/apiref.rst
Simple merge