projects / pithos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4819d34 3d13f97)
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)
Conflicts:
pithos/backends/lib/sqlite/node.py
pithos/backends/modular.py

1  2 
pithos/api/functions.py patch | diff1 | diff2 | blob | history

diff --cc pithos/api/functions.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.