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)
commit9d4808120bed0058e0cbded914d6f19bbe20629f
tree909fe68cf0d023b717e8c7a1d147966532b7abc1
parent840ccf4b45ae5e586a78868a86865d37416ebb55
parenta8943421ac12740f063aedf35496ab6b2e247666
Merge master into develop

Conflicts:
docs/conf.py
image_creator/version.py
version
image_creator/dialog_menu.py