Merge master into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:22:28 +0000 (11:22 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 18 Jul 2013 08:22:28 +0000 (11:22 +0300)
Conflicts:
docs/conf.py
image_creator/version.py
version

1  2 
image_creator/dialog_menu.py

Simple merge