ayende/ravendb — pull request #752 by redknightlois (2014-04-03 17:16:18+00:00)
Title: Fixed merge issues with RavenFS branch.

Those are the changes in conflict for RavenFS. There are still some outstanding error compiles for ChangesAPI.