Merge branch 'xseg-refactor' into debian
authorGiannakos Filippos <philipgian@grnet.gr>
Thu, 1 Nov 2012 10:20:57 +0000 (12:20 +0200)
committerGiannakos Filippos <philipgian@grnet.gr>
Thu, 1 Nov 2012 10:21:53 +0000 (12:21 +0200)
commit9e6fa1b5fc6b15441afe829aa96a3aa53372cc93
treeba8ab99780f517bc5328405035a85140781d1c1d
parent8fce9063106c2f604fc78c8d5e48a1b0b67980fc
parentefb7bdb0827d9f942afb18ac21721fcee70cbf36
Merge branch 'xseg-refactor' into debian

Conflicts:
xseg/peers/user/mt-mapperd.c
xseg/tools/vlmc
xseg/tools/vlmc