Merge branch 'master' into meta-domains
authorAntony Chazapis <chazapis@gmail.com>
Fri, 16 Dec 2011 10:59:20 +0000 (12:59 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Fri, 16 Dec 2011 10:59:20 +0000 (12:59 +0200)
commitc30d3c2805e809bf1dde28da93a246d1883eb48b
treee9f510efaf7621851d12ab3bcc2f974c31bd81b2
parent4819d34f6b323252da97b9898e5de3b591dd2771
parent3d13f97acae464f090d7b2a7588e9c7f54b6a3ee
Merge branch 'master' into meta-domains

Conflicts:
pithos/backends/lib/sqlite/node.py
pithos/backends/modular.py
pithos/api/functions.py