Merge branch 'feature-bsd-support' into develop
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 4 Nov 2013 13:03:16 +0000 (15:03 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 4 Nov 2013 13:03:16 +0000 (15:03 +0200)

Trivial merge