Commit 12343423 authored Dec 03, 2014 by Johannes Dillmann

Merge branch 'versioned_xloc' into versioned_xloc_client

Conflicts:
	cpp/src/libxtreemfs/file_handle_implementation.cpp

Some changes are not shown.

For a faster browsing experience, only 20 of 428+ files are shown. Download one of the files below to see all changes.

Please to comment