projects / kamaki / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 131f4e8 16c895d)
Merge branch 'develop' into feature-quota
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 14 Jan 2013 15:31:14 +0000 (17:31 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 14 Jan 2013 15:31:14 +0000 (17:31 +0200)
Conflicts:
kamaki/cli/commands/history_cli.py
kamaki/cli/commands/pithos_cli.py


Trivial merge
Kamaki