Merge branch 'develop'

Conflicts:
	Changelog
	kamaki/__init__.py
	setup.py

diff --cc Changelog
index ee60815,ffff2cc..daae51d
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -1,4 -1,23 +1,22 @@@
- CHANGELOG for version 0.6.3
+ CHANGELOG for version 0.7
  
- 1. Get rid of OrderedDict dependency (for python <= 2.6)
- 2. Minor fixes
+ New features:
+ 1. Unify and improve data size units presentation
+ 2. Ask for user permission at store-delete
+ 3. Intuitive semantics for store-move/copy/download/upload (modified syntax and clients)
+ 4. Use UUID instead of email in pithos client calls, make account setting obsolete
+ 5. Allow character : in container operations in store interface
+ 6. Recursively download remote directories
+ 
+ Improvements:
+ 1. Clean up CLI error handling code
+ 2. Dynamically limit max number of threads
+ 3. Cache user info in astakos client
+ 4. Organize client unittests in a package and update to comply with new synnefo specs
+ 
+ Bug fixes:
+ 1. kamaki image * commands should not send non-flag URL params without values
+ 2. Trace errors through all parts of kamaki code
+ 3. Quoted text in kamaki shell behaves same way as in one command mode
+ 4. Pithos container names with spaces fail
+ 5. URL-encode all url paths before requests
 -

diff --cc kamaki/__init__.py
index 3dd20fb,83ce275..269c804
--- 1/kamaki/__init__.py
--- 2/kamaki/__init__.py
+++ b/kamaki/__init__.py
@@@ -31,4 -31,4 +31,5 @@@
  # interpreted as representing official policies, either expressed
  # or implied, of GRNET S.A.
  
- __version__ = '0.6.3.3'
+ from kamaki.version import __version__
++

diff --cc setup.py
index 0c48ebb,82be180..6e35f95
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -42,9 -42,11 +42,14 @@@ import kamak
  
  optional = ['ansicolors',
              'progress>=1.0.2']
- requires = ['objpool',
-             'argparse']
+ requires = ['objpool']
  
++<<<<<<< HEAD
++=======
+ if version_info < (2, 7):
+     requires.append('argparse')
+ 
++>>>>>>> develop
  setup(
      name='kamaki',
      version=kamaki.__version__,

diff --cc version
index 0000000,c17c572..eb49d7c
mode 000000,100644..100644
--- /dev/null
--- 2/version
+++ b/version
@@@ -1,0 -1,1 +1,1 @@@
 -0.7next
++0.7