RavenDB-1565 Automatic conflict resolution (local vs remote)
Merge branch 'New3' of git://github.com/ayende/ravendb into RavenDB-1565
Deleting duplicated item in csproj
RavenDB-1610. Stats endpoint should return number of attachments
Merge branch 'RavenDB-1565' of https://github.com/arekais/ravendb into New3
Merge branch 'New3' of github.com:ayende/ravendb into New3