Merge branch 'meta-filtering'
authorchazapis <chazapis@gmail.com>
Fri, 23 Dec 2011 14:41:58 +0000 (16:41 +0200)
committerchazapis <chazapis@gmail.com>
Fri, 23 Dec 2011 14:41:58 +0000 (16:41 +0200)
commit12fb8c2d798413e4d86528d15271a832330de4f3
tree15f81fc3487bfd1a0c844e62ef90bd07079e21ee
parent91817b229483c10bfccc52e8b15da817f0f9a0e9
parent8877529a1905c383cb21dd772c20cac2c84a4abc
Merge branch 'meta-filtering'

Conflicts:
pithos/backends/lib/sqlalchemy/node.py
pithos/backends/lib/sqlite/node.py