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)
commit7e9c293986de8bcb88dbb4b8dfa155e4d2834ed6
tree8a5b7fcf4263f509d91b45cd7ad4e132e1cfd469
parentd43464a1ec9f9cbc63f090640eec8a1a4f4a803b
parent7fab57dcef5611b2275d9e11f39d887d92a1a7ff
Merge branch '2.1'
doc/apiref.rst