Merge branch 'develop' into debian-develop
authorFilippos Giannakos <philipgian@grnet.gr>
Mon, 22 Jul 2013 11:16:49 +0000 (14:16 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Mon, 22 Jul 2013 11:16:49 +0000 (14:16 +0300)
commit897a3070b6bc2fa6e137d57fef626d9321a8b07c
treebd3179935079599b8bd6a46dc6d8b800d771505c
parent0e98583d3519c3ff5337bfa3955ebaa670a318f0
parente01d10f70688b1bc32edb7da134a59a987fbf5fc
Merge branch 'develop' into debian-develop

Conflicts:
xseg/tools/archipelago/archipelago/common.py
xseg/tools/archipelago/archipelago/vlmc.py