Merge branch 'feature-stripxseg' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Mon, 24 Feb 2014 13:00:25 +0000 (15:00 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Mon, 24 Feb 2014 13:00:25 +0000 (15:00 +0200)
commitd807f4df0b975315d3b46089acb6092428b02b78
tree52d67c84b24914b534eb2bf49ed697f2ef0ce4f2
parent7f41acb38db5a6e3dba433885e5aa1f932b9b6bf
parent9dd81a7daec3a2e54761fa4efd9562305041944b
Merge branch 'feature-stripxseg' into develop