code.grnet.gr Git - archipelago/commit

author	Giannakos Filippos <philipgian@cslab.ece.ntua.gr>
	Fri, 28 Sep 2012 09:40:57 +0000 (12:40 +0300)
committer	Giannakos Filippos <philipgian@cslab.ece.ntua.gr>
	Fri, 28 Sep 2012 09:40:57 +0000 (12:40 +0300)
commit	989ad27ba6db9287884736a2613ae1b69f270d14
tree	a069e791cf66fba515b24b9ab97e77bad0a9d261	tree \| snapshot
parent	42a0461c45dccfb1e9060fb9f6f2086867851567	commit \| diff
parent	cf3d44d2c9ed2664f699494399231f5b4255ba59	commit \| diff

Merge branch 'xseg-refactor' of ssh://ray.cslab.ece.ntua.gr/repos/archip into xseg-refactor

Conflicts:
xseg/peers/kernel/xsegbd.c