Merge branch 'feature-windows-support' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Tue, 30 Jul 2013 13:44:29 +0000 (16:44 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Tue, 30 Jul 2013 13:44:29 +0000 (16:44 +0300)

Trivial merge