Bump version to 0.15next
Merge branch 'master' into develop

Bump version to 0.15.1next

Conflicts:
	docs/version.py
	version
	version.m4
Fix a bug in the usage of $EXP_SIZE_FD in export

Fix a bug in export script where the check of whether to use the
$EXP_SIZE_FD file descriptor was wrong.

This fixes #47
Allow control characters in JSON string literals

This is to allow multi-line base64 encoded data in the "contents"
attribute of img_personality.

Fixes #51
Add Brian Candler to the authors list
docs: Fix a minor typo in the Interface section
pithcat: Add support for Archipelago images

Synnefo version 0.16.0 completely removes the selectable storage backend
for Pithos, and introduces an integration with Archipelago, resulting in
necessary changes to the ModularBackend class.
In order to keep backward compatibility with older Synnefo versions, we
check the Pithos backend version and instantiate the ModularBackend
class appropriately.
pithcat: Fix a bug when using Synnefo version 0.16

PITHOS_INPUT_DATA env variable and '--data' option are not used
in Synnefo version 0.16.
Bump version to 0.15.2
Merge AM_INIT_AUTOMAKE entries in configure.ac

Newer versions of automake raise errors when multiple AM_INIT_AUTOMAKE
entries are defined.
Update ChangeLog and version files version 0.15.2
Merge branch 'hotfix-0.15.2'
Merge branch 'master' into debian
Bump version to 0.15.2-1~wheezy

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr>
Merge branch 'master' into develop

Bump version to 0.15.2next

Conflicts:
	docs/version.py
	version
	version.m4
docs: Add instructions for Ubuntu 14.04

Drop support for installing snf-image packages in Ubuntu 12.04 LTS and
add support for 14.04
Bump version 0.16rc1
Update the ChangeLog for version 0.16rc1
pithcat: Add Archipelago conf file in options

Rename PITHOS_INPUT_DB and PITHOS_INPUT_DATA to PITHOS_DB
and PITHOS_DATA respectively.

Change note message to reflect relevant commit changes.
Update the ChangeLog date for v0.16rc1