Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorpkanavos <pkanavos@gmail.com>
Tue, 15 May 2012 14:39:11 +0000 (17:39 +0300)
committerpkanavos <pkanavos@gmail.com>
Tue, 15 May 2012 14:39:11 +0000 (17:39 +0300)
commit6e9c8992d67d628c4f3948d30c20db2fb5efb715
treeb8818773487debb6cfb617c69bedaf5d973cdd43
parente0f698097edf2924a0e6eef53d4f6f117a72d4b5
parent4671d60635fd4da7bcad87ca46c0181c16d33f36
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
trunk/Pithos.Core/Agents/FileAgent.cs
trunk/Pithos.Core/Agents/FileAgent.cs