Resolve conflict
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Dec 2012 09:26:02 +0000 (11:26 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 18 Dec 2012 09:26:02 +0000 (11:26 +0200)
commit7942dd0c565d987ae748faf7be313a1aa6f26cc6
tree9efd569d26ad68c4e11b42ccce4fd5e320cfd987
parentfba9be975d95ebab7ce4e9f78c9903d6c66cb0ae
Resolve conflict
kamaki/clients/tests.py