Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:09:48 +0000 (22:09 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:09:48 +0000 (22:09 +0300)
1  2 
doc/apiref.rst

diff --cc doc/apiref.rst
Simple merge