Merge branch 'develop' into hotfix-0.9.3
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 2 Sep 2013 14:05:20 +0000 (17:05 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 2 Sep 2013 14:05:20 +0000 (17:05 +0300)
commit3bd1e7d05ed2b6cb7dcb906ecdfc99e834f2d6e7
treee1d5445dd38371494e39db30107bd49cc781dab6
parente8e75e662e2eb5de4c4adba93149f418587b5632
parent61b79815dded9bd39d387dc0b2e39649b2a3c678
Merge branch 'develop' into hotfix-0.9.3

Conflicts:
version