Merge branch 'feature-synnefo-0.14' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 20 Jun 2013 10:15:57 +0000 (13:15 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 20 Jun 2013 10:15:57 +0000 (13:15 +0300)
commitcd8229788cecd69111c23a4d9cf445f349f7be4b
tree9981b01eb4f9bce8d1a9520c14b6b4a7fa9d0aac
parent121f3bc0cf7fc8591c01e21dc686e07c685ef23a
parent8d66cd4c6a811a88bfc39988425cac0f3f9797a8
Merge branch 'feature-synnefo-0.14' into develop