%% This BibTeX bibliography file was created using BibDesk.
%% http://bibdesk.sourceforge.net/


%% Created for Pascal Urso at 2013-09-14 12:27:04 +0200 


%% Saved with string encoding Unicode (UTF-8) 


@string{apr = {April}}

@string{april = {April}}

@string{aug = {August}}

@string{august = {August}}

@string{dec = {December}}

@string{december = {December}}

@string{feb = {February}}

@string{february = {February}}

@string{jan = {January}}

@string{january = {January}}

@string{jul = {July}}

@string{july = {July}}

@string{jun = {June}}

@string{june = {June}}

@string{mar = {March}}

@string{march = {March}}

@string{may = {May}}

@string{nov = {November}}

@string{november = {November}}

@string{oct = {October}}

@string{october = {October}}

@string{sep = {September}}

@string{september = {September}}


@inproceedings{hattori2010syde,
	Abstract = {Team collaboration is essential for the success of multi-developer projects. When team members are spread across different locations, individual awareness of the activity of others drops due to communication barriers. We built Syde, a tool infrastructure to reestablish team awareness by sharing change and conflict information across developer's workspaces. Our main challenge is to balance the tradeoff between offering relevant information about the activity of the team and avoiding information overload. The novelty of our approach is that we model source code changes as first-class entities to record the detailed evolution of a multi-developer project. Hence, Syde delivers precise change information to interested developers.},
	Author = {Hattori, L. and Lanza, M.},
	Booktitle = {Software Engineering, 2010 ACM/IEEE 32nd International Conference on},
	Date-Added = {2013-09-14 10:23:51 +0000},
	Date-Modified = {2013-09-14 10:24:16 +0000},
	Doi = {10.1145/1810295.1810339},
	Issn = {0270-5257},
	Keywords = {groupware;information management;software engineering;software tools;source coding;team working;Syde;change information;collaborative software development;conflict information;information overload;multideveloper project;source code changes;team awareness;team collaboration;Conferences;Object oriented modeling;Presses;Servers;Software;Visualization;Syde;awareness;change;collaboration;visualization},
	Pages = {235-238},
	Title = {Syde: a tool for collaborative software development},
	Volume = {2},
	Year = {2010},
	Bdsk-Url-1 = {http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=6062168}}

@inproceedings{sarma2003palantir,
	Abstract = {Current configuration management systems promote workspaces that isolate developers from each other. This isolation is both good and bad It is good, because developers make their changes without any interference from changes made concurrently by other developers. It is bad, because not knowing which artifacts are changing in parallel regularly leads to problems when changes are promoted from workspaces into a central configuration management repository. Overcoming the bad isolation, while retaining the good isolation, is a matter of raising awareness among developers, an issue traditionally ignored by the discipline of configuration management. To fill this void, we have developed Palantir, a novel workspace awareness tool that complements existing configuration management systems by providing developers with insight into other workspaces. In particular, the tool informs a developer of which other developers change which other artifacts, calculates a simple measure of severity of those changes, and graphically displays the information in a configurable and generally non-obtrusive manner. To illustrate the use of Palantir, we demonstrate how it integrates with two representative configuration management systems.},
	Author = {Sarma, A. and Noroozi, Zahra and Van der Hoek, Andre},
	Booktitle = {Software Engineering, 2003. Proceedings. 25th International Conference on},
	Date-Added = {2013-09-11 15:58:33 +0000},
	Date-Modified = {2013-09-11 15:58:46 +0000},
	Doi = {10.1109/ICSE.2003.1201222},
	Issn = {0270-5257},
	Keywords = {configuration management;groupware;project support environments;Palantir workspace awareness tool;configuration management system;groupware;project support environments;Computer science;Displays;Filtering;Interference;Joining processes;Merging;Particle measurements;Project management;Visualization},
	Pages = {444-454},
	Title = {Palantir: raising awareness among configuration management workspaces},
	Year = {2003},
	Bdsk-Url-1 = {http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=1201222}}

@inproceedings{bird2009mining,
	Author = {Bird, C. and Rigby, P.C. and Barr, E.T. and Hamilton, D.J. and German, D.M. and Devanbu, P.},
	Booktitle = {Mining Software Repositories, 2009. MSR '09. 6th IEEE International Working Conference on},
	Date-Added = {2013-09-09 13:02:32 +0000},
	Date-Modified = {2013-09-09 13:03:30 +0000},
	Doi = {10.1109/MSR.2009.5069475},
	Keywords = {merge;data analysis;data mining;groupware;automatically recorded contributor attribution;central repository;collaboration;data analysis;decentralization;decentralized source code management systems;mining git;Birds;Collaborative work;Data analysis;History;Kernel;Linux;Open source software;Packaging;Rails},
	Pages = {1-10},
	Title = {The promises and perils of mining git},
	Year = {2009},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/MSR.2009.5069475},
	Bdsk-File-1 = { }}

@inproceedings{deSouza2012evaluating,
	Abstract = {It is common, in software development under version control, the need of parallel development of the source code via branches. Moreover, in most cases, the merge of these branches is necessary. Therefore, our work proposes the extraction of metrics that estimate the complexity to perform merges, making it possible to visualize, among all branches, which are the most critical and analyze the evolution of the metrics since the establishment of the branch. The evaluation of our work showed that some metrics behave better in order to estimate the complexity of integrating branches. For instance, the metric Number of Physical Conflicts reached up to 99% correlation when compared to the actual merge effort.},
	Author = {de Souza Santos, R. and Murta, L.G.P.},
	Booktitle = {Software Engineering (SBES), 2012 26th Brazilian Symposium on},
	Date-Added = {2013-07-26 06:27:31 +0000},
	Date-Modified = {2013-07-26 06:27:47 +0000},
	Doi = {10.1109/SBES.2012.16},
	Keywords = {configuration management;merging;software metrics;branch merging effort evaluation;metrics extraction;physical conflicts metric number;software development;source code parallel development;version control systems;Complexity theory;Java;Measurement;Merging;Software;Software engineering;Visualization;Branches;Configuration Management;Metrics;Visualization},
	Pages = {151-160},
	Title = {Evaluating the Branch Merging Effort in Version Control Systems},
	Year = {2012},
	Bdsk-Url-1 = {http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=6337868}}

@inproceedings{brun2010speculative,
	Acmid = {1882375},
	Address = {New York, NY, USA},
	Author = {Brun, Yuriy and Holmes, Reid and Ernst, Michael D. and Notkin, David},
	Booktitle = {Proceedings of the FSE/SDP workshop on Future of software engineering research},
	Date-Added = {2013-07-26 06:19:09 +0000},
	Date-Modified = {2013-07-26 06:20:25 +0000},
	Doi = {10.1145/1882362.1882375},
	Isbn = {978-1-4503-0427-6},
	Keywords = {developer awareness, ide, quick fix, recommender system, speculation, version control, merge},
	Location = {Santa Fe, New Mexico, USA},
	Numpages = {6},
	Pages = {59--64},
	Publisher = {ACM},
	Series = {FoSER '10},
	Title = {Speculative analysis: exploring future development states of software},
	Url = {http://doi.acm.org/10.1145/1882362.1882375},
	Year = {2010},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1882362.1882375},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1882362.1882375}}

@inproceedings{zimmermann2006minning,
	Acmid = {1138001},
	Address = {New York, NY, USA},
	Author = {Zimmermann, Thomas and Kim, Sunghun and Zeller, Andreas and Whitehead,Jr., E. James},
	Booktitle = {Proceedings of the 2006 international workshop on Mining software repositories},
	Date-Added = {2013-07-25 13:47:17 +0000},
	Date-Modified = {2013-07-25 13:52:44 +0000},
	Doi = {10.1145/1137983.1138001},
	Isbn = {1-59593-397-2},
	Location = {Shanghai, China},
	Numpages = {4},
	Pages = {72--75},
	Publisher = {ACM},
	Series = {MSR '06},
	Title = {Mining version archives for co-changed lines},
	Url = {http://doi.acm.org/10.1145/1137983.1138001},
	Year = {2006},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1137983.1138001},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1137983.1138001}}

@article{perry2001parallel,
	Author = {Perry, Dewayne E and Siy, Harvey P and Votta, Lawrence G},
	Date-Added = {2013-07-25 13:31:36 +0000},
	Date-Modified = {2013-07-25 13:31:36 +0000},
	Journal = {ACM Transactions on Software Engineering and Methodology (TOSEM)},
	Number = {3},
	Pages = {308--337},
	Publisher = {ACM},
	Title = {Parallel changes in large-scale software development: an observational case study},
	Volume = {10},
	Year = {2001}}

@inproceedings{leblang1995cm,
	Author = {Leblang, David B},
	Booktitle = {Configuration management},
	Date-Added = {2013-07-25 11:21:50 +0000},
	Date-Modified = {2013-07-25 11:21:50 +0000},
	Organization = {John Wiley \& Sons, Inc.},
	Pages = {1--37},
	Title = {The CM challenge: Configuration management that works},
	Year = {1995}}

@inproceedings{steiner2013MJ,
	Acmid = {2488049},
	Address = {Republic and Canton of Geneva, Switzerland},
	Author = {Steiner, Thomas and van Hooland, Seth and Summers, Ed},
	Booktitle = {Proceedings of the 22nd international conference on World Wide Web companion},
	Date-Added = {2013-07-25 10:03:06 +0000},
	Date-Modified = {2013-07-25 10:03:32 +0000},
	Isbn = {978-1-4503-2038-2},
	Keywords = {breaking news detection, event detection, internet relay chat, social networks, wikipedia},
	Location = {Rio de Janeiro, Brazil},
	Numpages = {4},
	Pages = {791--794},
	Publisher = {International World Wide Web Conferences Steering Committee},
	Series = {WWW '13 Companion},
	Title = {MJ no more: using concurrent wikipedia edit spikes with social network plausibility checks for breaking news detection},
	Url = {http://dl.acm.org/citation.cfm?id=2487788.2488049},
	Year = {2013},
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=2487788.2488049}}

@inproceedings{antin2012technology,
	Acmid = {2145264},
	Address = {New York, NY, USA},
	Author = {Antin, Judd and Cheshire, Coye and Nov, Oded},
	Booktitle = {Proceedings of the ACM 2012 conference on Computer Supported Cooperative Work},
	Date-Added = {2013-07-25 09:41:34 +0000},
	Date-Modified = {2013-07-25 09:42:46 +0000},
	Doi = {10.1145/2145204.2145264},
	Isbn = {978-1-4503-1086-4},
	Keywords = {legitimate peripheral participation., wiki-work, wikipedia},
	Location = {Seattle, Washington, USA},
	Numpages = {10},
	Pages = {373--382},
	Publisher = {ACM},
	Series = {CSCW '12},
	Title = {Technology-mediated contributions: editing behaviors among new wikipedians},
	Url = {http://doi.acm.org/10.1145/2145204.2145264},
	Year = {2012},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/2145204.2145264},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/2145204.2145264}}

@incollection{khanna2007formal,
	Author = {Khanna, Sanjeev and Kunal, Keshav and Pierce, Benjamin C},
	Booktitle = {FSTTCS 2007: Foundations of Software Technology and Theoretical Computer Science},
	Date-Added = {2013-07-15 13:39:13 +0000},
	Date-Modified = {2013-07-15 13:39:13 +0000},
	Pages = {485--496},
	Publisher = {Springer},
	Title = {A formal investigation of diff3},
	Year = {2007}}

@inproceedings{gutwin2004group,
	Author = {Gutwin, Carl and Penner, Reagan and Schneider, Kevin},
	Booktitle = {Proceedings of the 2004 ACM conference on Computer supported cooperative work},
	Date-Added = {2013-07-11 14:38:20 +0000},
	Date-Modified = {2013-07-11 14:38:20 +0000},
	Organization = {ACM},
	Pages = {72--81},
	Title = {Group awareness in distributed software development},
	Year = {2004}}

@inproceedings{alshattnawi2008concurrency,
	Abstract = {Currently, wikis are the most popular form of collaborative editors. Recently, some researches have proposed fully decentralized wikis relying on peer-to-peer networks. This new architecture subtly changes the behavior of wiki in case of concurrent changes. While traditional wikis ensure that all pages have been reviewed by a user, some pages in a P2P wiki are produced by the system through a automatic merge. To overcome this problem, this paper introduces concurrency awareness, a mechanism that makes users aware about the status of wiki pages. The particular context of a P2P wiki system makes traditional awareness mechanisms inadequate and requires the design of a new one.},
	Author = {Alshattnawi, S. and Canals, G. and Molli, P.},
	Booktitle = {Collaborative Technologies and Systems, 2008. CTS 2008. International Symposium on},
	Date-Added = {2013-07-11 12:50:38 +0000},
	Date-Modified = {2013-07-11 12:51:01 +0000},
	Doi = {10.1109/CTS.2008.4543942},
	Keywords = {concurrency control;information networks;peer-to-peer computing;search engines;P2P wiki system;awareness mechanisms;concurrency awareness;peer-to-peer networks;Collaboration;Concurrent computing;Context awareness;Costs;Irrigation;Network servers;Peer to peer computing;Resists;Service oriented architecture;Wikipedia;Architectures and Design of Collaborative Systems;Awareness in Collaborative Systems;wiki systems},
	Pages = {285-294},
	Title = {Concurrency awareness in a P2P wiki system},
	Year = {2008},
	Bdsk-Url-1 = {http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=4543942}}

@article{mens2002state,
	Abstract = {Software merging is an essential aspect of the maintenance and evolution of large-scale software systems. This paper provides a comprehensive survey and analysis of available merge approaches. Over the years, a wide variety of different merge techniques has been proposed. While initial techniques were purely based on textual merging, more powerful approaches also take the syntax and semantics of the software into account. There is a tendency towards operation-based merging because of its increased expressiveness. Another tendency is to try to define merge techniques that are as general, accurate, scalable, and customizable as possible, so that they can be used in any phase in the software life-cycle and detect as many conflicts as possible. After comparing the possible merge techniques, we suggest a number of important open problems and future research directions},
	Author = {Mens, T.},
	Date-Added = {2013-07-10 15:30:33 +0000},
	Date-Modified = {2013-07-10 15:30:50 +0000},
	Doi = {10.1109/TSE.2002.1000449},
	Issn = {0098-5589},
	Journal = {Software Engineering, IEEE Transactions on},
	Keywords = {configuration management;merging;software maintenance;conflict detection;conflict resolution;large-scale software systems;merge approaches;software life-cycle;software maintenance;software merging;textual merging;Merging},
	Number = {5},
	Pages = {449-462},
	Title = {A state-of-the-art survey on software merging},
	Volume = {28},
	Year = {2002},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=1000449}}

@misc{firepad,
	Date-Added = {2013-06-18 14:19:18 +0000},
	Date-Modified = {2013-06-18 14:20:13 +0000},
	Howpublished = {http://www.firepad.io/},
	Keywords = {OT, web, undo},
	Title = {firepad}}

@article{ronnau2012xcc,
	Author = {R{\"o}nnau, Sebastian and Borghoff, Uwe M},
	Date-Added = {2013-06-14 12:15:26 +0000},
	Date-Modified = {2013-06-14 12:15:59 +0000},
	Journal = {Computer Science-Research and Development},
	Keywords = {diff, XML diff},
	Number = {2},
	Pages = {95--111},
	Publisher = {Springer},
	Title = {XCC: change control of XML documents},
	Volume = {27},
	Year = {2012},
	Bdsk-File-1 = { }}

@misc{evernote,
	Date-Added = {2013-05-31 10:04:06 +0000},
	Date-Modified = {2013-05-31 10:04:36 +0000},
	Note = {{https://evernote.com}},
	Title = {Evernote}}

@misc{skydrive,
	Date-Added = {2013-05-30 16:24:34 +0000},
	Date-Modified = {2013-05-30 16:29:04 +0000},
	Keywords = {cloud},
	Note = {{https://skydrive.live.com/}},
	Title = {Microsoft SkyDrive},
	Year = {2013},
	Bdsk-Url-1 = {https://skydrive.live.com/}}

@misc{googledrive,
	Date-Added = {2013-05-30 16:24:34 +0000},
	Date-Modified = {2013-05-30 16:29:25 +0000},
	Note = {{https://drive.google.com}},
	Title = {Google Drive},
	Bdsk-Url-1 = {https://drive.google.com}}

@misc{cloud9,
	Date-Added = {2013-05-30 16:24:34 +0000},
	Date-Modified = {2013-05-30 16:28:33 +0000},
	Keywords = {cloud forge},
	Note = {{https://c9.io/}},
	Title = {Cloud9 {IDE}},
	Bdsk-Url-1 = {https://c9.io/}}

@misc{codiad,
	Date-Added = {2013-05-30 16:24:34 +0000},
	Date-Modified = {2013-05-30 16:28:51 +0000},
	Keywords = {cloud forge},
	Note = {{http://codiad.com/}},
	Title = {Codiad},
	Year = {2013},
	Bdsk-Url-1 = {http://codiad.com/}}

@misc{cacoo,
	Date-Added = {2013-05-30 16:24:34 +0000},
	Date-Modified = {2013-05-30 16:28:16 +0000},
	Keywords = {collaborative diagram, cloud},
	Note = {{https://cacoo.com}},
	Title = {Cacoo},
	Bdsk-Url-1 = {https://cacoo.com}}

@inproceedings{ignat2008providing,
	Author = {Ignat, Claudia-Lavinia and Papadopoulou, Stavroula and Oster, G{\'e}rald and Norrie, Moira C},
	Booktitle = {Proceedings of the 2008 ACM conference on Computer supported cooperative work},
	Date-Added = {2013-05-29 20:05:55 +0000},
	Date-Modified = {2013-05-31 12:30:07 +0000},
	Keywords = {ghost},
	Organization = {ACM},
	Pages = {659--668},
	Title = {Providing awareness in multi-synchronous collaboration without compromising privacy},
	Year = {2008}}

@incollection{rahhal2009multi,
	Author = {Rahhal, Charbel and Skaf-Molli, Hala and Molli, Pascal and Weiss, St{\'e}phane},
	Booktitle = {Web Information Systems Engineering-WISE 2009},
	Date-Added = {2013-05-29 19:59:20 +0000},
	Date-Modified = {2013-05-29 19:59:20 +0000},
	Pages = {115--129},
	Publisher = {Springer},
	Title = {Multi-synchronous collaborative semantic wikis},
	Year = {2009}}

@inproceedings{geyer2003supporting,
	Author = {Geyer, Werner and Vogel, J{\"u}rgen and Cheng, Li-Te and Muller, Michael},
	Booktitle = {Proceedings of the 2003 international ACM SIGGROUP conference on Supporting group work},
	Date-Added = {2013-05-29 19:51:14 +0000},
	Date-Modified = {2013-05-29 19:51:14 +0000},
	Organization = {ACM},
	Pages = {115--124},
	Title = {Supporting activity-centric collaboration through peer-to-peer shared objects},
	Year = {2003}}

@incollection{preguicca2005integrating,
	Author = {Pregui{\c{c}}a, Nuno and Martins, J Legatheaux and Domingos, Henrique and Duarte, S{\'e}rgio},
	Booktitle = {Groupware: Design, Implementation, and Use},
	Date-Added = {2013-05-29 19:44:27 +0000},
	Date-Modified = {2013-05-29 19:44:27 +0000},
	Pages = {89--104},
	Publisher = {Springer},
	Title = {Integrating synchronous and asynchronous interactions in groupware applications},
	Year = {2005}}

@inproceedings{molli2001state,
	Author = {Molli, Pascal and Skaf-Molli, Hala and Bouthier, Christophe},
	Booktitle = {Groupware, 2001. Proceedings. Seventh International Workshop on},
	Date-Added = {2013-05-29 19:42:31 +0000},
	Date-Modified = {2013-05-29 19:42:31 +0000},
	Organization = {IEEE},
	Pages = {106--114},
	Title = {State treemap: an awareness widget for multi-synchronous groupware},
	Year = {2001}}

@inproceedings{molli2002sams,
	Author = {Molli, Pascal and Skaf-Molli, Hala and Oster, G{\'e}rald and Jourdain, S{\'e}bastien},
	Booktitle = {Computer Supported Cooperative Work in Design, 2002. The 7th International Conference on},
	Date-Added = {2013-05-29 19:18:00 +0000},
	Date-Modified = {2013-05-29 19:18:00 +0000},
	Organization = {IEEE},
	Pages = {80--84},
	Title = {Sams: Synchronous, asynchronous, multi-synchronous environments},
	Year = {2002}}

@article{shao10fast,
	Address = {Los Alamitos, CA, USA},
	Author = {Bin Shao and Du Li and Ning Gu},
	Date-Added = {2013-03-04 12:29:12 +0000},
	Date-Modified = {2013-03-04 12:29:24 +0000},
	Doi = {http://doi.ieeecomputersociety.org/10.1109/TPDS.2010.64},
	Issn = {1045-9219},
	Journal = {IEEE Transactions on Parallel and Distributed Systems},
	Month = dec,
	Number = {12},
	Pages = {1707--1720},
	Publisher = {IEEE Computer Society},
	Title = {{A Fast Operational Transformation Algorithm for Mobile and Asynchronous Collaboration}},
	Volume = {21},
	Year = 2010,
	Bdsk-Url-1 = {http://doi.ieeecomputersociety.org/10.1109/TPDS.2010.64}}

@article{shneiderman84response,
	Acmid = {2517},
	Address = {New York, NY, USA},
	Author = {Ben Shneiderman},
	Date-Added = {2013-03-04 11:13:21 +0000},
	Date-Modified = {2013-03-04 11:14:01 +0000},
	Doi = {http://doi.acm.org/10.1145/2514.2517},
	Issn = {0360-0300},
	Journal = {ACM Computing Surveys},
	Keywords = {responsivness, 50ms},
	Month = sep,
	Number = {3},
	Numpages = {21},
	Pages = {265--285},
	Publisher = {ACM Press},
	Title = {{Response Time and Display Rate in Human Performance with Computers}},
	Url = {http://doi.acm.org/10.1145/2514.2517},
	Volume = {16},
	Year = {1984},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/2514.2517}}

@misc{etherpad,
	Author = {The Etherpad Foundation},
	Date-Added = {2013-02-27 11:47:58 +0000},
	Date-Modified = {2013-02-27 11:49:43 +0000},
	Keywords = {OT},
	Title = {Etherpad},
	Url = {http://etherpad.org/},
	Bdsk-Url-1 = {http://etherpad.org/}}

@unpublished{logootsplit,
	Author = {Luc Andr\'e and G\'erald Oster},
	Date-Added = {2013-02-21 09:24:25 +0000},
	Date-Modified = {2013-03-04 14:41:17 +0000},
	Month = {february},
	Note = {Publication in preparation},
	Title = {{LogootSplit}},
	Year = {2012}}

@misc{CouchDB,
	Author = {The Apache Software Foundation},
	Date-Added = {2013-02-20 10:32:20 +0000},
	Date-Modified = {2013-02-20 10:34:10 +0000},
	Keywords = {NoSQL},
	Title = {{Apache CouchBD}},
	Url = {http://couchdb.apache.org/},
	Bdsk-Url-1 = {http://couchdb.apache.org/}}

@misc{TeamEdit,
	Date-Added = {2013-02-19 15:28:15 +0000},
	Date-Modified = {2013-02-19 15:28:31 +0000},
	Key = {TeamEdit},
	Note = {\url{http://teamedit.sourceforge.net/}},
	Title = {{TeamEdit}. A collaborative text editor}}

@inproceedings{li06performance,
	Author = {Du Li and Rui Li},
	Booktitle = {Parallel and Distributed Systems, 2006. ICPADS 2006. 12th International Conference on},
	Date-Added = {2013-02-19 15:06:31 +0000},
	Date-Modified = {2013-02-19 15:06:58 +0000},
	Doi = {10.1109/ICPADS.2006.18},
	Issn = {1521-9097},
	Keywords = {Algorithm design and analysis;Character generation;Collaborative tools;Computer networks;Concurrency control;Concurrent computing;Humans;Measurement;Performance analysis;authoring systems;concurrency control;groupware;software performance evaluation;text editing;collaboration tools;computer network;group editing;group editors;operational transformation;optimistic concurrency control;performance evaluation;},
	Month = {0-0},
	Pages = {8 pp.},
	Title = {A performance study of group editing algorithms},
	Volume = {1},
	Year = {2006},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/ICPADS.2006.18}}

@article{jay07modeling,
	Acmid = {1275514},
	Address = {New York, NY, USA},
	Articleno = {8},
	Author = {Caroline Jay and Mashhuda Glencross and Roger Hubbold},
	Date-Added = {2013-02-05 14:47:21 +0000},
	Date-Modified = {2013-03-04 11:16:40 +0000},
	Doi = {10.1145/1275511.1275514},
	Issn = {1073-0516},
	Issue_Date = {August 2007},
	Journal = {ACM Transactions on Computer-Human Interaction},
	Keywords = {Haptics, distributed collaboration, latency, virtual environments, 50ms},
	Month = aug,
	Number = {2},
	Publisher = {ACM},
	Title = {Modeling the effects of delayed haptic and visual feedback in a collaborative virtual environment},
	Url = {http://doi.acm.org/10.1145/1275511.1275514},
	Volume = {14},
	Year = {2007},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1275511.1275514},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1275511.1275514}}

@inproceedings{nichols1995highlatency,
	Acmid = {215706},
	Address = {New York, NY, USA},
	Author = {Nichols, David A. and Curtis, Pavel and Dixon, Michael and Lamping, John},
	Booktitle = {Proceedings of the 8th annual ACM symposium on User interface and software technology},
	Date-Added = {2013-02-04 14:58:23 +0000},
	Date-Modified = {2013-02-04 14:58:45 +0000},
	Doi = {10.1145/215585.215706},
	Isbn = {0-89791-709-X},
	Keywords = {CSCW, UIMS, groupware toolkits, optimistic currency control, window toolkits},
	Location = {Pittsburgh, Pennsylvania, USA},
	Numpages = {10},
	Pages = {111--120},
	Publisher = {ACM},
	Series = {UIST '95},
	Title = {High-latency, low-bandwidth windowing in the Jupiter collaboration system},
	Url = {http://doi.acm.org/10.1145/215585.215706},
	Year = {1995},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/215585.215706},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/215585.215706}}

@inproceedings{roundy2005darcs,
	Acmid = {1088349},
	Address = {New York, NY, USA},
	Author = {Roundy, David},
	Booktitle = {Proceedings of the 2005 ACM SIGPLAN workshop on Haskell},
	Date-Added = {2013-02-04 14:51:21 +0000},
	Date-Modified = {2013-02-04 14:51:57 +0000},
	Doi = {10.1145/1088348.1088349},
	Isbn = {1-59593-071-X},
	Keywords = {DVCS},
	Location = {Tallinn, Estonia},
	Numpages = {4},
	Pages = {1--4},
	Publisher = {ACM},
	Series = {Haskell '05},
	Title = {Darcs: distributed version management in haskell},
	Url = {http://doi.acm.org/10.1145/1088348.1088349},
	Year = {2005},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1088348.1088349},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1088348.1088349}}

@phdthesis{gerlicher07developing,
	Author = {Ansgar Gerlicher},
	Date-Added = {2012-10-24 08:37:11 +0000},
	Date-Modified = {2012-10-24 08:39:13 +0000},
	Keywords = {operational transformation, XML},
	School = {University of the Arts London},
	Title = {Developing collaborative XML editing systems},
	Year = {2007},
	Bdsk-File-1 = { }}

@inproceedings{kovachev12realtime,
	Author = {Dejan Kovachev and Goekhan Aksakali and Ralf Klamma},
	Booktitle = {CollaborateCom},
	Date-Added = {2012-10-17 13:37:29 +0000},
	Date-Modified = {2012-10-17 13:39:27 +0000},
	Keywords = {XML, mobile, CMAX, real-time},
	Title = {A Real-time Collaboration-enabled Mobile Augmented Reality System with Semantic Multimedia},
	Year = {2012}}

@inproceedings{stolzenberg12CUERA,
	Author = {Daniel Stolzenberg and Erika M{\ ̈u}ller},
	Booktitle = {CollaborateCom},
	Date-Added = {2012-10-16 20:39:27 +0000},
	Date-Modified = {2012-10-16 20:45:46 +0000},
	Title = {CUERA: Performance evaluation of a generic data- and undo/redo-consistency framework},
	Year = {2012},
	Bdsk-File-1 = { }}

@inproceedings{wu2010partial,
	Address = {Los Alamitos, CA, USA},
	Author = {Qinyi Wu and Calton Pu and Joao Eduardo Ferreira},
	Booktitle = {Data Engineering, International Conference on (ICDE)},
	Date-Added = {2012-10-16 20:32:41 +0000},
	Date-Modified = {2012-10-16 20:41:48 +0000},
	Doi = {http://doi.ieeecomputersociety.org/10.1109/ICDE.2010.5447883},
	Isbn = {978-1-4244-5445-7},
	Keywords = {crdt, PPS},
	Pages = {776-779},
	Publisher = {IEEE Computer Society},
	Title = {A partial persistent data structure to support consistency in real-time collaborative editing},
	Year = {2010},
	Bdsk-Url-1 = {http://doi.ieeecomputersociety.org/10.1109/ICDE.2010.5447883}}

@inproceedings{ignat03treeopt,
	Acmid = {1241906},
	Address = {Norwell, MA, USA},
	Author = {Ignat, Claudia-Lavinia and Norrie, Moira C.},
	Booktitle = {Proceedings of the eighth conference on European Conference on Computer Supported Cooperative Work},
	Date-Added = {2012-09-19 17:04:59 +0200},
	Date-Modified = {2012-09-19 17:05:14 +0200},
	Location = {Helsinki, Finland},
	Numpages = {20},
	Pages = {315--334},
	Publisher = {Kluwer Academic Publishers},
	Series = {ECSCW'03},
	Title = {Customizable collaborative editor relying on treeOPT algorithm},
	Url = {http://dl.acm.org/citation.cfm?id=1241889.1241906},
	Year = {2003},
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=1241889.1241906}}

@article{gu05ontology,
	Author = {Ning Gu and Jun Xu and Xiaoyuan Wu and Jiangming Yang and Wei Ye},
	Date-Added = {2012-09-19 16:39:26 +0200},
	Date-Modified = {2012-09-19 16:53:45 +0200},
	Doi = {10.1016/j.aei.2005.05.005},
	Issn = {1474-0346},
	Journal = {Advanced Engineering Informatics},
	Keywords = {WordNet},
	Number = {2},
	Pages = {103 - 111},
	Title = {Ontology based semantic conflicts resolution in collaborative editing of design documents},
	Url = {http://www.sciencedirect.com/science/article/pii/S1474034605000352},
	Volume = {19},
	Year = {2005},
	Bdsk-Url-1 = {http://www.sciencedirect.com/science/article/pii/S1474034605000352},
	Bdsk-Url-2 = {http://dx.doi.org/10.1016/j.aei.2005.05.005}}

@inproceedings{ghemawat2003GFS,
	Acmid = {945450},
	Address = {New York, NY, USA},
	Author = {Ghemawat, Sanjay and Gobioff, Howard and Leung, Shun-Tak},
	Booktitle = {Proceedings of the nineteenth ACM symposium on Operating systems principles},
	Date-Added = {2012-07-20 15:00:29 +0200},
	Date-Modified = {2012-07-20 15:01:16 +0200},
	Doi = {10.1145/945445.945450},
	Isbn = {1-58113-757-5},
	Keywords = {clustered storage, data storage, fault tolerance, scalability, GFS, file system},
	Location = {Bolton Landing, NY, USA},
	Numpages = {15},
	Pages = {29--43},
	Publisher = {ACM},
	Series = {SOSP '03},
	Title = {The Google file system},
	Url = {http://doi.acm.org/10.1145/945445.945450},
	Year = {2003},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/945445.945450},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/945445.945450}}

@inproceedings{reiher1994resolving,
	Acmid = {1267269},
	Address = {Berkeley, CA, USA},
	Author = {Reiher, Peter and Heidemann, John and Ratner, David and Skinner, Greg and Popek, Gerald},
	Booktitle = {Proceedings of the USENIX Summer 1994 Technical Conference on USENIX Summer 1994 Technical Conference - Volume 1},
	Date-Added = {2012-06-15 14:38:40 +0200},
	Date-Modified = {2012-06-15 14:39:38 +0200},
	Keywords = {distributed file system, conflict resolution},
	Location = {Boston, Massachusetts},
	Numpages = {1},
	Pages = {12--12},
	Publisher = {USENIX Association},
	Series = {USTC'94},
	Title = {Resolving file conflicts in the Ficus file system},
	Url = {http://dl.acm.org/citation.cfm?id=1267257.1267269},
	Year = {1994},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=1267257.1267269}}

@inproceedings{kolbeck2011flease,
	Author = {Kolbeck, B. and H{\"o} andgqvist, M. and Stender, J. and Hupfeld, F.},
	Booktitle = {Parallel Distributed Processing Symposium (IPDPS), 2011 IEEE International},
	Date-Added = {2012-06-15 14:35:38 +0200},
	Date-Modified = {2012-06-15 14:37:13 +0200},
	Doi = {10.1109/IPDPS.2011.94},
	Issn = {1530-2075},
	Keywords = {lease, paxos, fault-tolerance},
	Month = {may},
	Pages = {978 -988},
	Title = {Flease - Lease Coordination Without a Lock Server},
	Year = {2011},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/IPDPS.2011.94}}

@inproceedings{stender2010loosely,
	Author = {Stender, J. and Hogqvist, M. and Kolbeck, B.},
	Booktitle = {Performance Computing and Communications Conference (IPCCC), 2010 IEEE 29th International},
	Date-Added = {2012-06-15 14:33:13 +0200},
	Date-Modified = {2012-06-15 14:34:52 +0200},
	Doi = {10.1109/PCCC.2010.5682311},
	Issn = {1097-2641},
	Keywords = {distributed file system, snapshots},
	Month = {dec.},
	Pages = {188 -197},
	Title = {Loosely time-synchronized snapshots in object-based file systems},
	Year = {2010},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/PCCC.2010.5682311}}

@article{richard1992ficus,
	Acmid = {964627},
	Address = {New York, NY, USA},
	Author = {Guy, Richard G. and Heidemann, John S. and Page,Jr., Thomas W.},
	Date-Added = {2012-06-15 14:29:57 +0200},
	Date-Modified = {2012-06-15 14:30:50 +0200},
	Issn = {0163-5980},
	Issue_Date = {April 1992},
	Journal = {SIGOPS Oper. Syst. Rev.},
	Keywords = {distributed file system, optimistic replication},
	Month = apr,
	Number = {2},
	Pages = {26--},
	Publisher = {ACM},
	Title = {The Ficus Replicated File System},
	Url = {http://dl.acm.org/citation.cfm?id=142111.964627},
	Volume = {26},
	Year = {1992},
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=142111.964627}}

@inproceedings{ratner1999roam,
	Author = {Ratner, D. and Reiher, P. and Popek, G.J.},
	Booktitle = {Database and Expert Systems Applications, 1999. Proceedings. Tenth International Workshop on},
	Date-Added = {2012-06-15 14:26:15 +0200},
	Date-Modified = {2012-06-15 14:28:02 +0200},
	Doi = {10.1109/DEXA.1999.795151},
	Keywords = {mobile, distributed file system, optimistic replication},
	Pages = {96 -104},
	Title = {Roam: a scalable replication system for mobile computing},
	Year = {1999},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/DEXA.1999.795151}}

@article{satyanarayanan2002coda,
	Acmid = {507053},
	Address = {New York, NY, USA},
	Author = {Satyanarayanan, M.},
	Date-Added = {2012-06-15 14:00:35 +0200},
	Date-Modified = {2012-06-15 14:02:44 +0200},
	Doi = {10.1145/507052.507053},
	Issn = {0734-2071},
	Issue_Date = {May 2002},
	Journal = {ACM Trans. Comput. Syst.},
	Keywords = {Adaptation, Linux, UNIX, Windows, caching, conflict resolution, distributed file system, continuous data access, data staging, disaster recovery, disconnected operation, failure, high availability, hoarding, intermittent networks, isolation-only transactions, low-bandwidth networks, mobile computing, optimistic replication, server replication, translucent cache management, weakly connected operation},
	Month = may,
	Number = {2},
	Numpages = {40},
	Pages = {85--124},
	Publisher = {ACM},
	Title = {The evolution of Coda},
	Url = {http://doi.acm.org/10.1145/507052.507053},
	Volume = {20},
	Year = {2002},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/507052.507053},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/507052.507053}}

@article{kistler1992coda,
	Acmid = {146942},
	Address = {New York, NY, USA},
	Author = {Kistler, James J. and Satyanarayanan, M.},
	Date-Added = {2012-06-15 13:57:50 +0200},
	Date-Modified = {2012-06-15 13:58:49 +0200},
	Doi = {10.1145/146941.146942},
	Issn = {0734-2071},
	Issue_Date = {Feb. 1992},
	Journal = {ACM Trans. Comput. Syst.},
	Keywords = {optimistic replication, distributed file system},
	Month = feb,
	Number = {1},
	Numpages = {23},
	Pages = {3--25},
	Publisher = {ACM},
	Title = {Disconnected operation in the Coda File System},
	Url = {http://doi.acm.org/10.1145/146941.146942},
	Volume = {10},
	Year = {1992},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/146941.146942},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/146941.146942}}

@article{dong2011rfs,
	Acmid = {1945036},
	Address = {New York, NY, USA},
	Author = {Dong, Yuan and Zhu, Haiyang and Peng, Jinzhan and Wang, Fang and Mesnier, Michael P. and Wang, Dawei and Chan, Sun C.},
	Date-Added = {2012-06-15 13:55:05 +0200},
	Date-Modified = {2012-06-15 13:55:54 +0200},
	Doi = {10.1145/1945023.1945036},
	Issn = {0163-5980},
	Issue_Date = {January 2011},
	Journal = {SIGOPS Oper. Syst. Rev.},
	Keywords = {cloud storage, mobile, distributed file system},
	Month = feb,
	Number = {1},
	Numpages = {11},
	Pages = {101--111},
	Publisher = {ACM},
	Title = {RFS: a network file system for mobile devices and the cloud},
	Url = {http://doi.acm.org/10.1145/1945023.1945036},
	Volume = {45},
	Year = {2011},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1945023.1945036},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1945023.1945036}}

@article{bolosky2007farsite,
	Acmid = {1243422},
	Address = {New York, NY, USA},
	Author = {Bolosky, William J. and Douceur, John R. and Howell, Jon},
	Date-Added = {2012-06-15 13:47:47 +0200},
	Date-Modified = {2012-06-15 13:50:29 +0200},
	Doi = {10.1145/1243418.1243422},
	Issn = {0163-5980},
	Issue_Date = {April 2007},
	Journal = {SIGOPS Oper. Syst. Rev.},
	Keywords = {formal system, serverless distributed file system, eventual consistency, TLA, lease},
	Month = apr,
	Number = {2},
	Numpages = {10},
	Pages = {17--26},
	Publisher = {ACM},
	Title = {The Farsite project: a retrospective},
	Url = {http://doi.acm.org/10.1145/1243418.1243422},
	Volume = {41},
	Year = {2007},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1243418.1243422},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1243418.1243422}}

@inproceedings{imine03proving,
	Acmid = {1241904},
	Address = {Norwell, MA, USA},
	Author = {Imine, Abdessamad and Molli, Pascal and Oster, G{\'e}rald and Rusinowitch, Micha\"{e}l},
	Booktitle = {Proceedings of the eighth conference on European Conference on Computer Supported Cooperative Work},
	Date-Added = {2012-05-24 15:58:19 +0200},
	Date-Modified = {2012-05-24 15:59:26 +0200},
	Keywords = {operation transformation, OT},
	Location = {Helsinki, Finland},
	Numpages = {17},
	Pages = {277--293},
	Publisher = {Kluwer Academic Publishers},
	Series = {ECSCW'03},
	Title = {Proving correctness of transformation functions in real-time groupware},
	Url = {http://dl.acm.org/citation.cfm?id=1241889.1241904},
	Year = {2003},
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=1241889.1241904}}

@misc{googledocs10ot,
	Date-Added = {2012-04-12 16:35:37 +0200},
	Date-Modified = {2013-05-30 16:30:48 +0000},
	Keywords = {operational transformation, OT},
	Note = {\url{http://googledocs.blogspot.fr/2010/09/whats-different-about-new-google-docs_22.html}},
	Title = {What's different about the new Google Docs},
	Year = {2010},
	Bdsk-Url-1 = {http://googledocs.blogspot.fr/2010/09/whats-different-about-new-google-docs_22.html}}

@inproceedings{dourish92awarness,
	Acmid = {143468},
	Address = {New York, NY, USA},
	Author = {Dourish, Paul and Bellotti, Victoria},
	Booktitle = {Proceedings of the 1992 ACM conference on Computer-supported cooperative work},
	Date-Added = {2012-04-12 16:18:07 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {0-89791-542-9},
	Keywords = {awareness, coordination, information sharing, shared feedback, shared workspaces},
	Location = {Toronto, Ontario, Canada},
	Numpages = {8},
	Pages = {107--114},
	Publisher = {ACM},
	Series = {CSCW '92},
	Title = {Awareness and coordination in shared workspaces},
	Year = {1992},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/143457.143468},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/143457.143468}}

@article{vogels09eventually,
	Acmid = {1435432},
	Address = {New York, NY, USA},
	Author = {Vogels, Werner},
	Date-Added = {2012-04-12 15:47:41 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0001-0782},
	Issue_Date = {January 2009},
	Journal = {Commun. ACM},
	Month = jan,
	Number = {1},
	Numpages = {5},
	Pages = {40--44},
	Publisher = {ACM},
	Title = {Eventually consistent},
	Volume = {52},
	Year = {2009},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1435417.1435432},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1435417.1435432}}

@article{vogels:2008:EC:1466443.1466448,
	Acmid = {1466448},
	Address = {New York, NY, USA},
	Author = {Vogels, Werner},
	Date-Added = {2012-04-12 15:46:33 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {1542-7730},
	Issue_Date = {October 2008},
	Journal = {Queue},
	Month = oct,
	Number = {6},
	Numpages = {6},
	Pages = {14--19},
	Publisher = {ACM},
	Title = {Eventually Consistent},
	Volume = {6},
	Year = {2008},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1466443.1466448},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/1466443.1466448}}

@inproceedings{quinson12parallel,
	Address = {Ottawa, Canada},
	Author = {Martin Quinson and Cristian Rosa and Christophe Thi\'ery},
	Booktitle = {12th IEEE/ACM International Symposium on Cluster, Cloud and Grid Computing (CCGrid'12)},
	Date-Added = {2012-03-28 21:19:27 +0200},
	Date-Modified = {2012-03-28 21:22:00 +0200},
	Month = {May},
	Title = {Parallel Simulation of Peer-to-Peer Systems},
	Year = {2012}}

@article{prakash94framework,
	Acmid = {198427},
	Address = {New York, NY, USA},
	Author = {Prakash, Atul and Knister, Michael J.},
	Date-Added = {2012-03-28 12:02:39 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {1073-0516},
	Issue_Date = {Dec. 1994},
	Journal = {ACM Trans. Comput.-Hum. Interact.},
	Keywords = {operation transformation, DistEdit, computer-supported cooperative work, concurrency control, groupware, selective undo, state recovery, undo, user recovery},
	Month = dec,
	Number = {4},
	Numpages = {36},
	Pages = {295--330},
	Publisher = {ACM},
	Title = {A framework for undoing actions in collaborative systems},
	Volume = {1},
	Year = {1994},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/198425.198427},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/198425.198427}}

@inproceedings{vidot00copies,
	Acmid = {358988},
	Address = {New York, NY, USA},
	Author = {Vidot, Nicolas and Cart, Michelle and Ferri\'{e}, Jean and Suleiman, Maher},
	Booktitle = {Proceedings of the 2000 ACM conference on Computer supported cooperative work},
	Date-Added = {2012-02-29 16:31:47 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-222-0},
	Keywords = {SOCT 4, operation transformation, OT},
	Location = {Philadelphia, Pennsylvania, United States},
	Numpages = {10},
	Pages = {171--180},
	Publisher = {ACM},
	Series = {CSCW '00},
	Title = {Copies convergence in a distributed real-time collaborative environment},
	Year = {2000},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/358916.358988}}

@inproceedings{suleiman97serialization,
	Acmid = {267369},
	Address = {New York, NY, USA},
	Author = {Suleiman, Maher and Cart, Mich\`{e}le and Ferri\'{e}, Jean},
	Booktitle = {Proceedings of the international ACM SIGGROUP conference on Supporting group work: the integration challenge},
	Date-Added = {2012-02-29 16:19:28 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {0-89791-897-5},
	Keywords = {SOCT 2, concurrency control, distributed systems, groupware systems, multi-user editors, operation transposition},
	Location = {Phoenix, Arizona, United States},
	Numpages = {11},
	Pages = {435--445},
	Publisher = {ACM},
	Series = {GROUP '97},
	Title = {Serialization of concurrent operations in a distributed collaborative environment},
	Year = {1997},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/266838.267369}}

@inproceedings{hitz94file,
	Acmid = {1267093},
	Address = {Berkeley, CA, USA},
	Author = {Hitz, Dave and Lau, James and Malcolm, Michael},
	Booktitle = {Proceedings of the USENIX Winter 1994 Technical Conference on USENIX Winter 1994 Technical Conference},
	Date-Added = {2012-02-12 17:24:45 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Keywords = {eventual consistency},
	Location = {San Francisco, California},
	Numpages = {1},
	Pages = {19--19},
	Publisher = {USENIX Association},
	Title = {File system design for an NFS file server appliance},
	Year = {1994},
	Bdsk-Url-1 = {http://dl.acm.org/citation.cfm?id=1267074.1267093}}

@article{davidson85consistency,
	Acmid = {5508},
	Address = {New York, NY, USA},
	Author = {Davidson, Susan B. and Garcia-Molina, Hector and Skeen, Dale},
	Date-Added = {2012-02-11 14:27:12 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0360-0300},
	Issue = {3},
	Journal = {ACM Comput. Surv.},
	Month = {September},
	Numpages = {30},
	Pages = {341--370},
	Publisher = {ACM},
	Title = {Consistency in a partitioned network: a survey},
	Volume = {17},
	Year = {1985},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/5505.5508}}

@techreport{martin11abstract,
	Abstract = {{Trees are fundamental data structure for many areas of computer science and system engineering. In this report, we show how to ensure eventual consistency of optimistically replicated trees. In optimistic replication, the different replicas of a distributed system are allowed to diverge but should eventually reach the same value if no more mutations occur. A new method to ensure eventual consistency is to design Conflict-free Replicated Data Types (CRDT). In this report, we design a collection of tree CRDT using existing set CRDTs. The remaining concurrency problems particular to tree data structure are resolved using one or two layers of correction algorithm. For each of these layer, we propose different and independent policies. Any combination of set CRDT and policies can be constructed, giving to the distributed application programmer the entire control of the behavior of the shared data in face of concurrent mutations. We also propose to order these trees by adding a positioning layer which is also independent to obtain a collection of ordered tree CRDTs.}},
	Affiliation = {SCORE - INRIA Lorraine - LORIA},
	Author = {Martin, St{\'e}phane and Ahmed-Nacer, Mehdi and Urso, Pascal},
	Date-Added = {2011-12-12 21:53:40 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Hal_Id = {hal-00648106},
	Institution = {INRIA},
	Keywords = {Distributed System, Eventual Consistency, CRDT, Optimistic Replication, Data Consistency, Tree},
	Language = {Anglais},
	Month = Dec,
	Number = {RR-7825},
	Pages = {23},
	Pdf = {http://hal.inria.fr/hal-00648106/PDF/RR-7825.pdf},
	Title = {Abstract unordered and ordered trees CRDT},
	Type = {Rapport de recherche},
	Year = {2011},
	Bdsk-Url-1 = {http://hal.inria.fr/hal-00648106/en/}}

@article{rubin78enumerating,
	Author = {Rubin, F.},
	Date-Added = {2011-12-02 11:18:24 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0098-4094},
	Journal = {Circuits and Systems, IEEE Transactions on},
	Keywords = {Graph theory;},
	Month = {aug},
	Number = {8},
	Pages = {641 - 642},
	Title = {Enumerating all simple paths in a graph},
	Volume = {25},
	Year = {1978},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/TCS.1978.1084515}}

@inproceedings{lloyd11dontsettle,
	Acmid = {2043593},
	Address = {New York, NY, USA},
	Author = {Lloyd, Wyatt and Freedman, Michael J. and Kaminsky, Michael and Andersen, David G.},
	Booktitle = {Proceedings of the Twenty-Third ACM Symposium on Operating Systems Principles},
	Date-Added = {2011-11-29 14:54:52 +0000},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-4503-0977-6},
	Keywords = {ALPS systems, causal + consistency, key-value storage, read transactions, scalable wide-area replication},
	Location = {Cascais, Portugal},
	Numpages = {16},
	Pages = {401--416},
	Publisher = {ACM},
	Series = {SOSP '11},
	Title = {Don't settle for eventual: scalable causal consistency for wide-area storage with COPS},
	Year = {2011},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/2043556.2043593}}

@article{preguica10dotted,
	Abstract = {In cloud computing environments, a large number of users access data stored in highly available storage systems. To provide good performance to geographically disperse users and allow operation even in the presence of failures or network partitions, these systems often rely on optimistic replication solutions that guarantee only eventual consistency. In this scenario, it is important to be able to accurately and efficiently identify updates executed concurrently. In this paper, first we review, and expose problems with current approaches to causality tracking in optimistic replication: these either lose information about causality or do not scale, as they require replicas to maintain information that grows linearly with the number of clients or updates. Then, we propose a novel solution that fully captures causality while being very concise in that it maintains information that grows linearly only with the number of servers that register updates for a given data element, bounded by the degree of replication.},
	Author = {Nuno Pregui{\c c}a and Carlos Baquero and Paulo S{\'e}rgio Almeida and Victor Fonte and Ricardo Gon{\c c}alves},
	Date-Added = {2011-11-29 12:16:35 +0000},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Eprint = {1011.5808v1},
	Keywords = {riak, key-value store},
	Month = {11},
	Title = {Dotted Version Vectors: Logical Clocks for Optimistic Replication},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://arxiv.org/abs/1011.5808v1}}

@article{fredman87fibonacci,
	Acmid = {28874},
	Address = {New York, NY, USA},
	Author = {Fredman, Michael L. and Tarjan, Robert Endre},
	Date-Added = {2011-11-24 22:02:05 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0004-5411},
	Issue = {3},
	Journal = {J. ACM},
	Keywords = {shortest path},
	Month = {July},
	Numpages = {20},
	Pages = {596--615},
	Publisher = {ACM},
	Title = {Fibonacci heaps and their uses in improved network optimization algorithms},
	Volume = {34},
	Year = {1987},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/28869.28874}}

@article{gabow86efficient,
	Affiliation = {University of Colorado 80309 Boulder CO USA},
	Author = {Gabow, Harold and Galil, Zvi and Spencer, Thomas and Tarjan, Robert},
	Date-Added = {2011-11-24 21:45:51 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0209-9683},
	Issue = {2},
	Journal = {Combinatorica},
	Keyword = {MST, graphs, minimun spaning tree},
	Note = {10.1007/BF02579168},
	Pages = {109-122},
	Publisher = {Springer Berlin / Heidelberg},
	Title = {Efficient algorithms for finding minimum spanning trees in undirected and directed graphs},
	Volume = {6},
	Year = {1986},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dx.doi.org/10.1007/BF02579168}}

@article{chazelle2000minimun,
	Acmid = {355562},
	Address = {New York, NY, USA},
	Author = {Chazelle, Bernard},
	Date-Added = {2011-11-24 21:27:56 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0004-5411},
	Issue = {6},
	Journal = {J. ACM},
	Keywords = {graphs, matroids, minimum spanning trees, MST},
	Month = {November},
	Numpages = {20},
	Pages = {1028--1047},
	Publisher = {ACM},
	Title = {A minimum spanning tree algorithm with inverse-Ackermann type complexity},
	Volume = {47},
	Year = {2000},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/355541.355562}}

@article{prim57shortest,
	Author = {R. C. Prim},
	Date-Added = {2011-11-24 13:51:24 +0100},
	Date-Modified = {2011-11-24 13:52:34 +0100},
	Journal = {Bell Systems Technical Journal},
	Keywords = {graph, minimum spanning tree, MST},
	Month = nov,
	Pages = {1389--1401},
	Title = {Shortest connection networks and some generalizations.},
	Year = {1957}}

@inproceedings{wuu84efficient,
	Acmid = {806750},
	Address = {New York, NY, USA},
	Author = {Wuu, Gene T.J. and Bernstein, Arthur J.},
	Booktitle = {Proceedings of the third annual ACM symposium on Principles of distributed computing},
	Date-Added = {2011-11-17 22:14:50 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {0-89791-143-1},
	Keywords = {U-Set, CRDT},
	Location = {Vancouver, British Columbia, Canada},
	Numpages = {10},
	Pages = {233--242},
	Publisher = {ACM},
	Series = {PODC '84},
	Title = {Efficient solutions to the replicated log and dictionary problems},
	Year = {1984},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/800222.806750}}

@inproceedings{shapiro11conflictfree,
	Address = {Grenoble, France},
	Author = {Marc Shapiro and Nuno Pregui{\c c}a and Carlos Baquero and Marek Zawirski},
	Booktitle = intsympon # {Stabilization, Safety, and Security of                   Distributed Systems (SSS)},
	Date-Added = {2011-11-17 11:54:14 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Editor = {Xavier D{\'e}fago and Franck Petit and V. Villain},
	Keywords = {CRDT},
	Month = oct,
	Pages = {386--400},
	Publisher = springer,
	Series = lncs,
	Title = {Conflict-free Replicated Data Types},
	Volume = 6976,
	Year = 2011,
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://lip6.fr/Marc.Shapiro/papers/CRDTs_SSS-2011.pdf}}

@article{dijkstra59note,
	Affiliation = {Mathematisch Centrum 2e Boerhaavestraat 49 Amsterdam-O},
	Author = {Dijkstra, E. W.},
	Date-Added = {2011-11-11 12:18:33 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0029-599X},
	Issue = {1},
	Journal = {Numerische Mathematik},
	Keyword = {Mathematics and Statistics},
	Keywords = {BFS},
	Note = {10.1007/BF01386390},
	Pages = {269-271},
	Publisher = {Springer Berlin / Heidelberg},
	Title = {A note on two problems in connexion with graphs},
	Volume = {1},
	Year = {1959},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dx.doi.org/10.1007/BF01386390}}

@book{diestel2010graph,
	Author = {Reinhard Diestel},
	Date-Added = {2011-11-11 09:05:36 +0100},
	Date-Modified = {2011-11-11 09:07:27 +0100},
	Edition = {Fourth Edition},
	Publisher = {Springer-Verlag},
	Title = {Graph Theory},
	Year = {2010}}

@techreport{shapiro11comprehensive,
	Abstract = {{Eventual consistency aims to ensure that replicas of some mutable shared object converge without foreground synchronisation. Previous approaches to eventual consistency are ad-hoc and error-prone. We study a principled approach: to base the design of shared data types on some simple formal conditions that are sufficient to guarantee eventual consistency. We call these types Convergent or Commutative Replicated Data Types (CRDTs). This paper formalises asynchronous object replication, either state based or operation based, and provides a sufficient condition appropriate for each case. It describes several useful CRDTs, including container data types supporting both \add and \remove operations with clean semantics, and more complex types such as graphs, montonic DAGs, and sequences. It discusses some properties needed to implement non-trivial CRDTs.}},
	Affiliation = {REGAL - INRIA Rocquencourt - INRIA - CNRS : UMR7606 - Universit{\'e} Pierre et Marie Curie - Paris VI - Laboratoire d'Informatique de Paris 6 - LIP6 - CNRS : UMR7606 - Universit{\'e} Pierre et Marie Curie - Paris VI - Centro de Investiga{\c c}{\\~a}o em Inform{\'a}tica e Tecnologias da Informa{\c c}{\\~a}o - CITI - Universidade Nova de Lisboa - Universidade do Minho Departamento de Inform{\'a}tica Distributed Systems Group - Universidade do Minho Departamento de Inform{\'a}tica - Campus de Azur{\'e}m},
	Author = {Shapiro, Marc and Pregui{\c c}a, Nuno and Baquero, Carlos and Zawirski, Marek},
	Collaboration = {INRIA, UNL, U Minho, LIP6},
	Date-Added = {2011-10-26 14:27:22 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Hal_Id = {inria-00555588},
	Institution = {INRIA},
	Keywords = {eventual consistency; optimistic replication; replicated data types; distributed algorithms; distributed systems; Data replication; commutative operations; CRDT},
	Language = {English},
	Month = Jan,
	Number = {RR-7506},
	Pages = {50},
	Pdf = {http://hal.inria.fr/inria-00555588/PDF/techreport.pdf},
	Title = {{A comprehensive study of Convergent and Commutative Replicated Data Types}},
	Type = {Research Report},
	Year = {2011},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00555588/en/}}

@phdthesis{martin11these,
	Author = {St\'{e}phane Martin},
	Date-Added = {2011-09-22 12:04:00 -0700},
	Date-Modified = {2011-09-22 12:06:13 -0700},
	Keywords = {XML CRDT undo move},
	School = {Universit\'{\'e} de Provence},
	Title = {Edition collaborative des documents semi-structur{\'e}s},
	Year = {2011},
	Bdsk-File-1 = { }}

@inproceedings{ahmednacer11evaluating,
	Address = {San Francisco, CA, USA},
	Author = {Mehdi Ahmed-Nacer and Claudia-Lavinia Ignat and G\'erald Oster and Hyun-Gul Roh and Pascal Urso},
	Booktitle = {ACM Symposium on Document Engineering},
	Date-Added = {2011-06-24 13:48:56 +0200},
	Date-Modified = {2011-06-24 13:52:35 +0200},
	Editor = {ACM},
	Month = {september},
	Pages = {10 pages},
	Title = {Evaluating CRDTs for Real-time Document Editing},
	Year = {2011}}

@inproceedings{fraser09differential,
	Acmid = {1600198},
	Address = {New York, NY, USA},
	Author = {Fraser, Neil},
	Booktitle = {Proceedings of the 9th ACM symposium on Document engineering},
	Date-Added = {2011-06-15 11:04:58 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-60558-575-8},
	Keywords = {collaboration, synchronization, diff},
	Location = {Munich, Germany},
	Numpages = {8},
	Pages = {13--20},
	Publisher = {ACM},
	Series = {DocEng '09},
	Title = {Differential synchronization},
	Year = {2009},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1600193.1600198}}

@inproceedings{ronnau09efficient,
	Acmid = {1600197},
	Address = {New York, NY, USA},
	Author = {R\"{o}nnau, Sebastian and Philipp, Geraint and Borghoff, Uwe M.},
	Booktitle = {Proceedings of the 9th ACM symposium on Document engineering},
	Date-Added = {2011-06-15 11:00:51 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-60558-575-8},
	Keywords = {XML diff, XML merge, office documents, tree-to-tree correction, version control},
	Location = {Munich, Germany},
	Numpages = {10},
	Pages = {3--12},
	Publisher = {ACM},
	Series = {DocEng '09},
	Title = {Efficient change control of XML documents},
	Year = {2009},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1600193.1600197}}

@inproceedings{benamara10estimating,
	Author = {Benamara, L. and Magnien, C.},
	Booktitle = {INFOCOM IEEE Conference on Computer Communications Workshops, 2010},
	Date-Added = {2011-06-10 14:46:50 +0200},
	Date-Modified = {2011-06-10 14:47:49 +0200},
	Organization = {IEEE},
	Pages = {1--6},
	Title = {Estimating properties in dynamic systems: the case of churn in P2P networks},
	Year = {2010},
	Bdsk-File-1 = { }}

@inproceedings{alvaro11consistency,
	Author = {Peter Alvaro and Neil Conway and Joe Hellerstein and William R. Marczak},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CIDR},
	Crossref = {DBLP:conf/cidr/2011},
	Date-Added = {2011-06-09 16:43:19 +0200},
	Date-Modified = {2011-06-09 16:53:18 +0200},
	Ee = {http://www.cidrdb.org/cidr2011/Papers/CIDR11_Paper35.pdf},
	Keywords = {commutativity, toread},
	Pages = {249-260},
	Title = {Consistency Analysis in Bloom: a CALM and Collected Approach},
	Year = {2011},
	Bdsk-File-1 = { }}

@proceedings{DBLP:conf/cidr/2011,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CIDR},
	Date-Added = {2011-06-09 16:43:00 +0200},
	Date-Modified = {2011-06-09 16:43:00 +0200},
	Publisher = {www.crdrdb.org},
	Title = {CIDR 2011, Fifth Biennial Conference on Innovative Data Systems Research, Asilomar, CA, USA, January 9-12, 2011, Online Proceedings},
	Year = {2011}}

@inproceedings{kulkarni11exploiting,
	Author = {Milind Kulkarni and Donald Nguyen and Dimitrios Prountzos and Xin Sui and Keshav Pingali},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {PLDI},
	Crossref = {DBLP:conf/pldi/2011},
	Date-Added = {2011-06-09 16:18:01 +0200},
	Date-Modified = {2011-06-09 16:18:38 +0200},
	Ee = {http://doi.acm.org/10.1145/1993498.1993562},
	Pages = {542-555},
	Title = {Exploiting the commutativity lattice},
	Year = {2011},
	Bdsk-File-1 = { }}

@proceedings{DBLP:conf/pldi/2011,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {PLDI},
	Date-Added = {2011-06-09 16:18:01 +0200},
	Date-Modified = {2011-06-09 16:18:01 +0200},
	Editor = {Mary W. Hall and David A. Padua},
	Isbn = {978-1-4503-0663-8},
	Publisher = {ACM},
	Title = {Proceedings of the 32nd ACM SIGPLAN Conference on Programming Language Design and Implementation, PLDI 2011, San Jose, CA, USA, June 4-8, 2011},
	Year = {2011}}

@inproceedings{koskinen10coarse,
	Acmid = {1706304},
	Address = {New York, NY, USA},
	Author = {Koskinen, Eric and Parkinson, Matthew and Herlihy, Maurice},
	Booktitle = {Proceedings of the 37th annual ACM SIGPLAN-SIGACT symposium on Principles of programming languages},
	Date-Added = {2011-06-09 16:02:56 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-60558-479-9},
	Keywords = {abstract data-types, coarse-grained transactions, commutativity, movers, transactional boosting, transactional memory},
	Location = {Madrid, Spain},
	Numpages = {12},
	Pages = {19--30},
	Publisher = {ACM},
	Series = {POPL '10},
	Title = {Coarse-grained transactions},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1706299.1706304}}

@article{gilbert02brewer,
	Acmid = {564601},
	Address = {New York, NY, USA},
	Author = {Gilbert, Seth and Lynch, Nancy},
	Date-Added = {2011-03-01 16:02:05 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0163-5700},
	Issue = {2},
	Journal = {SIGACT News},
	Keywords = {CAP},
	Month = {June},
	Numpages = {9},
	Pages = {51--59},
	Publisher = {ACM},
	Title = {Brewer's conjecture and the feasibility of consistent, available, partition-tolerant web services},
	Volume = {33},
	Year = {2002},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/564585.564601}}

@inproceedings{brewer00towards,
	Acmid = {343502},
	Address = {New York, NY, USA},
	Author = {Brewer, Eric A.},
	Booktitle = {Proceedings of the nineteenth annual ACM symposium on Principles of distributed computing},
	Date-Added = {2011-03-01 15:57:20 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-183-6},
	Keywords = {CAP},
	Location = {Portland, Oregon, United States},
	Pages = {7--},
	Publisher = {ACM},
	Series = {PODC '00},
	Title = {Towards robust distributed systems (abstract)},
	Year = {2000},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/343477.343502}}

@article{sun09context,
	Author = {Sun, D. and Sun, C.},
	Date-Added = {2011-02-28 16:48:28 +0100},
	Date-Modified = {2011-02-28 16:48:46 +0100},
	Issn = {1045-9219},
	Journal = {Parallel and Distributed Systems, IEEE Transactions on},
	Number = {10},
	Pages = {1454--1470},
	Publisher = {IEEE},
	Title = {Context-based operational transformation in distributed collaborative editing systems},
	Volume = {20},
	Year = {2009}}

@conference{baker11megastore,
	Author = {Baker, J. and Bond, C. and Corbett, J.C. and Furman, JJ and Khorlin, A. and Larson, J. and L{\'e}on, J.M. and Li, Y. and Lloyd, A. and Yushprakh, V.},
	Booktitle = {Proc. CIDR},
	Date-Added = {2011-02-28 16:13:13 +0100},
	Date-Modified = {2011-06-09 11:07:32 +0200},
	Keywords = {ACID google database consensus},
	Title = {Megastore: Providing Scalable, Highly Available Storage for Interactive Services},
	Year = {2011},
	Bdsk-File-1 = { }}

@conference{bernstein80timestamp,
	Author = {Bernstein, P.A. and Goodman, N.},
	Booktitle = {Proceedings of the sixth international conference on Very Large Data Bases-Volume 6},
	Date-Added = {2011-02-24 15:51:18 +0100},
	Date-Modified = {2011-02-24 15:51:25 +0100},
	Organization = {VLDB Endowment},
	Pages = {285--300},
	Title = {Timestamp-based algorithms for concurrency control in distributed database systems},
	Year = {1980}}

@article{roh11replicated,
	Author = {Hyun-Gul Roh and Myeongjae Jeon and Jin-Soo Kim and Joonwon Lee},
	Date-Added = {2011-02-24 14:57:57 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0743-7315},
	Journal = {Journal of Parallel and Distributed Computing},
	Keywords = {Optimistic replication, RADT, CRDT, linear structure, RGA},
	Number = {3},
	Pages = {354 - 368},
	Title = {Replicated abstract data types: Building blocks for collaborative applications},
	Volume = {71},
	Year = {2011},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://www.sciencedirect.com/science/article/B6WKJ-51PRY76-1/2/6d733fff5d3f5efb46321d5b522a0dd2},
	Bdsk-Url-2 = {http://dx.doi.org/10.1016/j.jpdc.2010.12.006}}

@article{weiss10logootundo,
	Address = {Los Alamitos, CA, USA},
	Author = {Stephane Weiss and Pascal Urso and Pascal Molli},
	Date-Added = {2011-02-15 16:31:38 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {1045-9219},
	Journal = {IEEE Transactions on Parallel and Distributed Systems},
	Keywords = {CRDT},
	Pages = {1162-1174},
	Publisher = {IEEE Computer Society},
	Title = {Logoot-Undo: Distributed Collaborative Editing System on P2P Networks},
	Volume = {21},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.ieeecomputersociety.org/10.1109/TPDS.2009.173}}

@conference{brewer2000towards,
	Author = {Brewer, E.A.},
	Booktitle = {Proceedings of the Annual ACM Symposium on Principles of Distributed Computing},
	Date-Added = {2011-02-03 21:39:24 +0100},
	Date-Modified = {2011-02-03 21:39:24 +0100},
	Pages = {7--10},
	Title = {{Towards robust distributed systems}},
	Volume = {19},
	Year = {2000}}

@article{li10admissibility,
	Affiliation = {Nokia Research Center 955 Page Mill Road Palo Alto CA 94304 USA},
	Author = {Li, Du and Li, Rui},
	Date-Added = {2010-11-24 11:35:53 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0925-9724},
	Issue = {1},
	Journal = {Computer Supported Cooperative Work (CSCW)},
	Keyword = {Computer Science},
	Note = {10.1007/s10606-009-9103-1},
	Pages = {1-43},
	Publisher = {Springer Netherlands},
	Title = {An Admissibility-Based Operational Transformation Framework for Collaborative Editing Systems},
	Volume = {19},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dx.doi.org/10.1007/s10606-009-9103-1}}

@phdthesis{weissphd,
	Author = {St\'{e}phane Weiss},
	Date-Added = {2010-11-12 17:08:50 +0100},
	Date-Modified = {2010-11-12 17:10:36 +0100},
	Keywords = {CRDT logoot},
	Month = {October},
	School = {Universit\'e Henri Poincar\'{e}},
	Title = {Edition collaborative massive sur r\'{e}seaux Pair-\'{a}-Pair},
	Year = {2010}}

@article{chang08bigtable,
	Acmid = {1365816},
	Address = {New York, NY, USA},
	Articleno = {4},
	Author = {Chang, Fay and Dean, Jeffrey and Ghemawat, Sanjay and Hsieh, Wilson C. and Wallach, Deborah A. and Burrows, Mike and Chandra, Tushar and Fikes, Andrew and Gruber, Robert E.},
	Date-Added = {2010-11-12 16:48:13 +0100},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0734-2071},
	Issue = {2},
	Journal = {ACM Trans. Comput. Syst.},
	Keywords = {Large-Scale Distributed Storage cloud},
	Month = {June},
	Numpages = {26},
	Pages = {4:1--4:26},
	Publisher = {ACM},
	Title = {Bigtable: A Distributed Storage System for Structured Data},
	Volume = {26},
	Year = {2008},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1365815.1365816}}

@inproceedings{martin10scalable,
	Author = {St\'{e}phane Martin and Pascal Urso and St\'{e}phane Weiss},
	Booktitle = {On the Move to Meaningful Internet Systems: OTM 2010},
	Date-Added = {2010-10-29 12:01:57 +0300},
	Date-Modified = {2010-10-29 12:02:35 +0300},
	Editor = {Robert Meersman and Tharam Dillon and Pilar Herrero},
	Isbn = {978-3-642-16933-5},
	Keywords = {CRDT},
	Location = {Heidelberg},
	Pages = {507--514},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Scalable XML Collaborative Editing with Undo},
	Volume = {6426},
	Year = {2010}}

@inproceedings{solis10multilayer,
	Author = {Carlos Sol\'{\i}s and Jos\'{e} H. Can\'{o}s and Marcos R.S. Borges},
	Booktitle = {On the Move to Meaningful Internet Systems: OTM 2010},
	Date-Added = {2010-10-29 12:00:50 +0300},
	Date-Modified = {2010-10-29 12:01:29 +0300},
	Editor = {Robert Meersman and Tharam Dillon and Pilar Herrero},
	Isbn = {978-3-642-16933-5},
	Keywords = {xml version},
	Location = {Heidelberg},
	Pages = {340--357},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Multilayer Superimposed Information for Collaborative Annotation in Wikis},
	Volume = {6426},
	Year = {2010},
	Bdsk-File-1 = { }}

@techreport{martin10scalableRR,
	Abstract = {{C}ommutative {R}eplicated {D}ata-{T}ype ({CRDT}) is a new class of algorithms that ensure scalable consistency of replicated data. {I}t has been successfully applied to collaborative editing of texts without complex concurrency control. {I}n this paper, we present a {CRDT} to edit {XML} data. {C}ompared to existing approaches for {XML} collaborative editing, our approach is more scalable and handles all the {XML} editing aspects : elements, contents, attributes and undo. {I}ndeed, undo is recognized as an important feature for collaborative editing that allows to overcome system complexity through error recovery or collaborative conflict resolution.},
	Affiliation = {{L}aboratoire d'informatique {F}ondamentale de {M}arseille - {LIF} - {CNRS} : {UMR}6166 - {U}niversit{\'e} de la {M}{\'e}diterran{\'e}e - {A}ix-{M}arseille {II} - {U}niversit{\'e} de {P}rovence - {A}ix-{M}arseille {I} - {SCORE} - {INRIA} {L}orraine - {LORIA} - {INRIA} - {U}niversit{\'e} {N}ancy {II} - {U}niversit{\'e} {H}enri {P}oincar{\'e} - {N}ancy {I}},
	Author = {{M}artin, {S}t{\'e}phane and {U}rso, {P}ascal and {W}eiss, {S}t{\'e}phane},
	Date-Added = {2010-10-18 15:25:55 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Hal_Id = {inria-00508436},
	Institution = {INRIA},
	Keywords = {CRDT},
	Language = {{A}nglais},
	Month = {08},
	Number = {{RR}-7362},
	Pages = {23},
	Title = {{S}calable {XML} {C}ollaborative {E}diting with {U}ndo},
	Type = {Research Report},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00508436/PDF/RR-7362.pdf}}

@inproceedings{weiss09logoot,
	Address = {Montr\'eal, Qu\'ebec, Canada},
	Author = {Weiss, S. and Urso, P. and Molli, P.},
	Booktitle = {29th IEEE International Conference on Distributed Computing Systems (ICDCS 2009)},
	Date-Added = {2010-10-18 15:20:58 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {1063-6927},
	Journal = {Distributed Computing Systems, 2009. ICDCS '09. 29th IEEE International Conference on},
	Keywords = {Logoot;P2P networks;Wikipedia;distributed collaborative editing systems;peer-to-peer collaborative editing system;scalable optimistic replication algorithm;Web sites;peer-to-peer computing;},
	Month = {jun.},
	Organization = {IEEE Computer Society},
	Pages = {404 -412},
	Title = {Logoot: A Scalable Optimistic Replication Algorithm for Collaborative Editing on P2P Networks},
	Year = {2009},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/ICDCS.2009.75}}

@inproceedings{viondury10diffing,
	Address = {New York, NY, USA},
	Author = {Vion-Dury, Jean-Yves},
	Booktitle = {DocEng '10: Proceedings of the 10th ACM symposium on Document engineering},
	Date-Added = {2010-09-27 10:49:02 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-4503-0231-9},
	Location = {Manchester, United Kingdom},
	Pages = {191--194},
	Publisher = {ACM},
	Title = {Diffing, patching and merging XML documents: toward a generic calculus of editing deltas.},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://portal.acm.org/ft_gateway.cfm?id=1860600&type=pdf&coll=portal&dl=GUIDE&CFID=106234365&CFTOKEN=80389194},
	Bdsk-Url-2 = {http://doi.acm.org/10.1145/1860559.1860600}}

@inproceedings{thao10using,
	Address = {New York, NY, USA},
	Author = {Thao, Cheng and Munson, Ethan V.},
	Booktitle = {DocEng '10: Proceedings of the 10th ACM symposium on Document engineering},
	Date-Added = {2010-09-27 10:46:24 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-4503-0231-9},
	Location = {Manchester, United Kingdom},
	Pages = {77--86},
	Publisher = {ACM},
	Title = {Using versioned tree data structure, change detection and node identity for three-way XML merging},
	Year = {2010},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://portal.acm.org/ft_gateway.cfm?id=1860578&type=pdf&coll=portal&dl=GUIDE&CFID=106234153&CFTOKEN=34187449},
	Bdsk-Url-2 = {http://doi.acm.org/10.1145/1860559.1860578}}

@article{schwarz94detecting,
	Address = {London, UK},
	Author = {Schwarz, Reinhard and Mattern, Friedemann},
	Date-Added = {2010-09-10 10:49:27 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0178-2770},
	Journal = {Distrib. Comput.},
	Keywords = {causality, clock},
	Number = {3},
	Pages = {149--174},
	Publisher = {Springer-Verlag},
	Title = {Detecting causal relationships in distributed computations: in search of the holy grail},
	Volume = {7},
	Year = {1994},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://dx.doi.org/10.1007/BF02277859}}

@article{gupta02fighting,
	Author = {Gupta, I. and Birman, K.P. and van Renesse, R.},
	Date-Added = {2010-09-10 10:36:17 +0200},
	Date-Modified = {2011-06-10 14:47:55 +0200},
	Journal = {Quality and Reliability Engineering International},
	Keywords = {consensus},
	Number = {3},
	Pages = {165--184},
	Publisher = {John Wiley \& Sons},
	Title = {Fighting fire with fire: using randomized gossip to combat stochastic scalability limits},
	Volume = {18},
	Year = {2002},
	Bdsk-File-1 = { }}

@article{raynal96logical,
	Author = {Raynal, M. and Singhal, M.},
	Date-Added = {2010-09-10 10:34:03 +0200},
	Date-Modified = {2011-06-10 14:48:05 +0200},
	Journal = {Computer},
	Keywords = {clock},
	Number = {2},
	Pages = {49--56},
	Title = {Logical time: Capturing causality in distributed systems},
	Volume = {29},
	Year = {1996},
	Bdsk-File-1 = { }}

@article{nwt09age,
	Author = {Ben Zimmer},
	Date-Added = {2010-07-23 14:27:11 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Journal = {The New York Times},
	Number = {September 20},
	Pages = {MM18 of the New York edition},
	Read = {1},
	Title = {The Age of Undoing},
	Year = {2009},
	Bdsk-Url-1 = {http://www.nytimes.com/2009/09/20/magazine/20FOB-onlanguage-t.html}}

@inproceedings{staworko06validity,
	Author = {Slawomir Staworko and Jan Chomicki},
	Booktitle = {Current Trends in Database Technology -- EDBT 2006},
	Date-Added = {2010-07-01 15:20:56 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Keywords = {repare},
	Pages = {164-177},
	Series = {Lecture Notes in Computer Science},
	Title = {Validity-Sensitive Querying of XML Databases},
	Volume = {4254},
	Year = {2006},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://www.springerlink.com/content/4r7260xj21q84357/fulltext.pdf},
	Bdsk-Url-2 = {http://dx.doi.org/10.1007/11896548_16}}

@inproceedings{martin10fixing,
	Author = {St\'ephane Martin and Denis Lugiez},
	Booktitle = {CDVE},
	Date-Added = {2010-07-01 15:16:45 +0200},
	Date-Modified = {2012-09-19 17:01:20 +0200},
	Keywords = {xml repare crdt},
	Title = {Fixing Collaborative Edition on Typed Documents},
	Year = {2010},
	Bdsk-File-1 = { }}

@inproceedings{letia09crdt,
	Address = {Big Sky, MT, USA},
	Author = {Mihai Letia and Nuno Pregui{\c c}a and Marc Shapiro},
	Booktitle = {{SOSP} W.\ on Large Scale Distributed Systems and Middleware (LADIS)},
	Comment = {REQUIRES \usepackage[latin10]{inputenc}},
	Date-Added = {2010-06-30 17:59:58 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Keywords = {core nebula},
	Month = oct,
	Organization = {sigops},
	Pages = {29--34},
	Publisher = {acm},
	Title = {{CRDTs}: Consistency without concurrency control},
	Year = 2009,
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1773912.1773921}}

@article{decandia07dynamo,
	Address = {New York, NY, USA},
	Author = {DeCandia, Giuseppe and Hastorun, Deniz and Jampani, Madan and Kakulapati, Gunavardhan and Lakshman, Avinash and Pilchin, Alex and Sivasubramanian, Swaminathan and Vosshall, Peter and Vogels, Werner},
	Date-Added = {2010-06-25 15:39:56 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0163-5980},
	Journal = {SIGOPS Oper. Syst. Rev.},
	Number = {6},
	Pages = {205--220},
	Publisher = {ACM},
	Title = {Dynamo: amazon's highly available key-value store},
	Volume = {41},
	Year = {2007},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1323293.1294281}}

@inproceedings{gu07dcv,
	Address = {New York, NY, USA},
	Author = {Gu, Ning and Zhang, Qiwei and Yang, Jiangming and Ye, Wei},
	Booktitle = {GROUP '07: Proceedings of the 2007 international ACM conference on Supporting group work},
	Date-Added = {2010-06-23 16:10:44 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-59593-845-9},
	Keywords = {real-time, causal barrier},
	Location = {Sanibel Island, Florida, USA},
	Pages = {157--166},
	Publisher = {ACM},
	Title = {Dcv: a causality detection approach for large-scale dynamic collaboration environments},
	Year = {2007},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1316624.1316647}}

@inproceedings{jimenez01replication,
	Author = {Ricardo Jim{\'e}nez-Peris and Marta Pati{\~n}o-Mart\'{\i}nez and Bettina Kemme and Gustavo Alonso},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {SRDS},
	Crossref = {DBLP:conf/srds/2001},
	Date-Added = {2010-06-23 14:43:44 +0200},
	Date-Modified = {2010-06-23 14:45:57 +0200},
	Ee = {http://computer.org/proceedings/srds/1366/13660024abs.htm},
	Keywords = {quorum},
	Pages = {24-33},
	Title = {How to Select a Replication Protocol According to Scalability, Availability, and Communication Overhead},
	Year = {2001}}

@proceedings{DBLP:conf/srds/2001,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {SRDS},
	Date-Added = {2010-06-23 14:43:44 +0200},
	Date-Modified = {2010-06-23 14:43:44 +0200},
	Isbn = {0-7695-1366-2},
	Publisher = {IEEE Computer Society},
	Title = {20th Symposium on Reliable Distributed Systems (SRDS 2001), 28-31 October 2001, New Orleans, LA, USA},
	Year = {2001}}

@inproceedings{lindholm03xml,
	Address = {New York, NY, USA},
	Author = {Lindholm, Tancred},
	Booktitle = {MobiDe '03: Proceedings of the 3rd ACM international workshop on Data engineering for wireless and mobile access},
	Date-Added = {2010-06-21 14:18:31 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-767-2},
	Location = {San Diego, CA, USA},
	Pages = {93--97},
	Publisher = {ACM},
	Title = {XML three-way merge as a reconciliation engine for mobile data},
	Year = {2003},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://portal.acm.org/ft_gateway.cfm?id=940940&type=pdf&coll=GUIDE&dl=GUIDE&CFID=94430062&CFTOKEN=38628619},
	Bdsk-Url-2 = {http://doi.acm.org/10.1145/940923.940940}}

@article{koloniari05peer,
	Address = {New York, NY, USA},
	Author = {Koloniari, Georgia and Pitoura, Evaggelia},
	Date-Added = {2010-06-21 14:15:57 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0163-5808},
	Journal = {SIGMOD Rec.},
	Number = {2},
	Pages = {6--17},
	Publisher = {ACM},
	Title = {Peer-to-peer management of XML data: issues and research challenges},
	Volume = {34},
	Year = {2005},
	Bdsk-Url-1 = {http://portal.acm.org/ft_gateway.cfm?id=1083788&type=pdf&coll=GUIDE&dl=GUIDE&CFID=94429799&CFTOKEN=48186657},
	Bdsk-Url-2 = {http://doi.acm.org/10.1145/1083784.1083788}}

@inproceedings{abiteboul03dynamic,
	Address = {New York, NY, USA},
	Author = {Abiteboul, Serge and Bonifati, Angela and Cob\'{e}na, Gr\'{e}gory and Manolescu, Ioana and Milo, Tova},
	Booktitle = {SIGMOD '03: Proceedings of the 2003 ACM SIGMOD international conference on Management of data},
	Date-Added = {2010-06-21 14:11:21 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-634-X},
	Location = {San Diego, California},
	Pages = {527--538},
	Publisher = {ACM},
	Title = {Dynamic XML documents with distribution and replication},
	Year = {2003},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/872757.872821}}

@inproceedings{cart07asynchronous,
	Author = {Cart, M. and Ferrie, J.},
	Booktitle = {Proceedings of the 2007 International Conference on Collaborative Computing: Networking, Applications and Worksharing},
	Date-Added = {2010-06-21 11:12:34 +0200},
	Date-Modified = {2010-06-21 11:13:27 +0200},
	Keywords = {mot2},
	Organization = {IEEE Computer Society},
	Pages = {127--138},
	Title = {{Asynchronous reconciliation based on operational transformation for P2P collaborative environments}},
	Year = {2007}}

@inproceedings{choudhary95general,
	Address = {Norwell, MA, USA},
	Author = {Choudhary, Rajiv and Dewan, Prasun},
	Booktitle = {ECSCW'95: Proceedings of the fourth conference on European Conference on Computer-Supported Cooperative Work},
	Date-Added = {2010-06-21 10:24:49 +0200},
	Date-Modified = {2010-06-21 10:25:15 +0200},
	Isbn = {0-7923-3697-6},
	Location = {Stockholm, Sweden},
	Pages = {231--246},
	Publisher = {Kluwer Academic Publishers},
	Title = {A general multi-user undo/redo model},
	Year = {1995}}

@book{maeda06laws,
	Author = {John Maeda},
	Date-Added = {2010-06-16 14:56:13 +0200},
	Date-Modified = {2010-06-16 14:57:50 +0200},
	Keywords = {undo},
	Publisher = {MIT Press},
	Title = {The laws of simplicity},
	Year = {2006}}

@proceedings{DBLP:conf/cdve/2009,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CDVE},
	Date-Added = {2010-06-11 13:28:52 +0200},
	Date-Modified = {2010-06-11 13:28:52 +0200},
	Editor = {Yuhua Luo},
	Ee = {http://dx.doi.org/10.1007/978-3-642-04265-2},
	Isbn = {978-3-642-04264-5},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Cooperative Design, Visualization, and Engineering, 6th International Conference, CDVE 2009, Luxembourg, Luxembourg, September 20-23, 2009. Proceedings},
	Volume = {5738},
	Year = {2009}}

@inproceedings{martin09collaborative,
	Author = {St{\'e}phane Martin and Denis Lugiez},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {IADIS AC (2)},
	Crossref = {DBLP:conf/iadis/2009ac},
	Date-Added = {2010-06-11 13:28:37 +0200},
	Date-Modified = {2010-06-11 13:29:37 +0200},
	Keywords = {XML},
	Pages = {124-128},
	Title = {Collaborative peer to peer edition: Avoiding conflicts is better than solving conflicts},
	Year = {2009}}

@proceedings{DBLP:conf/iadis/2009ac,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {IADIS AC},
	Date-Added = {2010-06-11 13:28:37 +0200},
	Date-Modified = {2010-06-11 13:28:37 +0200},
	Editor = {Hans Weghorn and Pedro T. Isa\'{\i}as},
	Isbn = {978-972-8924-97-3},
	Publisher = {IADIS Press},
	Title = {Proceedings of the IADIS International Conference Applied Computing 2009, 19-21 November, Rome, Italy, 2 Volumes},
	Year = {2009}}

@inproceedings{ignat08xml,
	Author = {Claudia-Lavinia Ignat and G{\'e}rald Oster},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CDVE},
	Crossref = {DBLP:conf/cdve/2008},
	Date-Added = {2010-06-11 13:21:02 +0200},
	Date-Modified = {2010-06-11 13:21:40 +0200},
	Ee = {http://dx.doi.org/10.1007/978-3-540-88011-0_9},
	Pages = {66-73},
	Title = {Peer-to-peer collaboration over XML documents},
	Year = {2008}}

@proceedings{DBLP:conf/cdve/2008,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CDVE},
	Date-Added = {2010-06-11 13:21:02 +0200},
	Date-Modified = {2010-06-11 13:21:02 +0200},
	Editor = {Yuhua Luo},
	Isbn = {978-3-540-88010-3},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Cooperative Design, Visualization, and Engineering, 5th International Conference, CDVE 2008, Calvi{\`a}, Mallorca, Spain, September 21-25, 2008, Proceedings},
	Volume = {5220},
	Year = {2008}}

@inproceedings{preguica09commutative,
	Author = {Nuno M. Pregui\c{c}a and Joan Manuel Marqu{\`e}s and Marc Shapiro and Mihai Letia},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {ICDCS},
	Crossref = {DBLP:conf/icdcs/2009},
	Date-Added = {2010-06-10 17:31:48 +0200},
	Date-Modified = {2011-11-25 15:31:27 +0100},
	Ee = {http://dx.doi.org/10.1109/ICDCS.2009.20},
	Keywords = {CRDT, treedoc},
	Pages = {395-403},
	Read = {1},
	Title = {A Commutative Replicated Data Type for Cooperative Editing},
	Year = {2009},
	Bdsk-File-1 = { }}

@proceedings{DBLP:conf/icdcs/2009,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {ICDCS},
	Date-Added = {2010-06-10 17:31:47 +0200},
	Date-Modified = {2010-06-10 17:31:47 +0200},
	Publisher = {IEEE Computer Society},
	Title = {29th IEEE International Conference on Distributed Computing Systems (ICDCS 2009), 22-26 June 2009, Montreal, Qu{\'e}bec, Canada},
	Year = {2009}}

@inproceedings{obrien04joyce,
	Address = {New York, NY, USA},
	Author = {O'Brien, James and Shapiro, Marc},
	Booktitle = {EW 11: Proceedings of the 11th workshop on ACM SIGOPS European workshop},
	Date-Added = {2010-05-10 10:43:14 +0200},
	Date-Modified = {2010-05-10 11:18:01 +0200},
	Pages = {31},
	Publisher = {ACM},
	Title = {Undo for anyone, anywhere, anytime},
	Year = {2004}}

@inproceedings{sun00undo,
	Address = {New York, NY, USA},
	Author = {Sun, Chengzheng},
	Booktitle = {CSCW '00: Proceedings of the 2000 ACM conference on Computer supported cooperative work},
	Date-Added = {2010-05-10 10:38:38 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-222-0},
	Location = {Philadelphia, Pennsylvania, United States},
	Pages = {191--200},
	Publisher = {ACM},
	Title = {Undo any operation at any time in group editors},
	Year = {2000},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/358916.358990},
	Bdsk-Url-2 = {http://portal.acm.org/ft_gateway.cfm?id=358990&type=pdf&coll=GUIDE&dl=GUIDE&CFID=89755748&CFTOKEN=84253490}}

@inproceedings{ressel99reduce,
	Address = {New York, NY, USA},
	Author = {Ressel, Matthias and Gunzenh\"{a}user, Rul},
	Booktitle = {GROUP '99: Proceedings of the international ACM SIGGROUP conference on Supporting group work},
	Date-Added = {2010-05-10 10:25:01 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {1-58113-065-1},
	Keywords = {OT},
	Location = {Phoenix, Arizona, United States},
	Pages = {131--139},
	Publisher = {ACM},
	Title = {Reducing the problems of group undo},
	Year = {1999},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://portal.acm.org/ft_gateway.cfm?id=320312&type=pdf&coll=GUIDE&dl=GUIDE&CFID=89754210&CFTOKEN=51267673},
	Bdsk-Url-2 = {http://doi.acm.org/10.1145/320297.320312}}

@article{garcia83semantic,
	Author = {Garcia-Molina, H.},
	Date-Added = {2010-05-10 10:18:26 +0200},
	Date-Modified = {2010-05-10 10:18:48 +0200},
	Journal = {ACM Transactions on Database Systems (TODS)},
	Number = {2},
	Pages = {186--213},
	Publisher = {ACM},
	Title = {Using semantic knowledge for transaction processing in a distributed database},
	Volume = {8},
	Year = {1983}}

@article{berlage94selective,
	Address = {New York, NY, USA},
	Author = {Berlage, Thomas},
	Date-Added = {2010-05-10 09:54:10 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {1073-0516},
	Journal = {ACM Trans. Comput.-Hum. Interact.},
	Number = {3},
	Pages = {269--294},
	Publisher = {ACM},
	Title = {A selective undo mechanism for graphical user interfaces based on command objects},
	Volume = {1},
	Year = {1994},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/196699.196721},
	Bdsk-Url-2 = {http://portal.acm.org/ft_gateway.cfm?id=196721&type=pdf&coll=GUIDE&dl=GUIDE&CFID=89750411&CFTOKEN=47279429}}

@inproceedings{kittur07conflict,
	Address = {New York, NY, USA},
	Author = {Kittur, Aniket and Suh, Bongwon and Pendleton, Bryan A. and Chi, Ed H.},
	Booktitle = {CHI '07: Proceedings of the SIGCHI conference on Human factors in computing systems},
	Date-Added = {2010-05-07 11:51:48 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-59593-593-9},
	Keywords = {wikipedia},
	Location = {San Jose, California, USA},
	Pages = {453--462},
	Publisher = {ACM},
	Title = {He says, she says: conflict and coordination in Wikipedia},
	Year = {2007},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1240624.1240698}}

@inproceedings{lakshman09cassandra,
	Address = {Big Sky, MT, USA},
	Author = {Avinash Lakshman and Prashant Malik},
	Booktitle = {Proceedings of The 3rd {ACM} {SIGOPS} International Workshop on Large Scale Distributed Systems and Middleware (LADIS)},
	Date-Added = {2010-04-17 23:35:01 +0200},
	Date-Modified = {2010-04-17 23:44:45 +0200},
	Keywords = {facebook, nosql},
	Month = {October},
	Organization = {SIGOPS},
	Title = {Cassandra - A Decentralized Structured Storage System},
	Year = {2009},
	Bdsk-File-1 = { }}

@misc{activedirectory,
	Author = {Microsoft},
	Date-Added = {2010-04-17 23:29:52 +0200},
	Date-Modified = {2010-04-17 23:30:55 +0200},
	Title = {Active Directory},
	Year = {2000}}

@article{thomas79rule,
	Author = {Robert H. Thomas},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Date-Added = {2010-04-17 23:14:57 +0200},
	Date-Modified = {2010-04-17 23:15:16 +0200},
	Ee = {http://doi.acm.org/10.1145/320071.320076, db/journals/tods/Thomas79.html},
	Journal = {ACM Trans. Database Syst.},
	Number = {2},
	Pages = {180-209},
	Title = {A Majority Consensus Approach to Concurrency Control for Multiple Copy Databases},
	Volume = {4},
	Year = {1979},
	Bdsk-File-1 = { }}

@inproceedings{burrows06chubby,
	Author = {Michael Burrows},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {OSDI},
	Crossref = {DBLP:conf/osdi/2006},
	Date-Added = {2010-04-17 23:03:01 +0200},
	Date-Modified = {2010-04-17 23:05:29 +0200},
	Ee = {http://www.usenix.org/events/osdi06/tech/burrows.html},
	Keywords = {paxos},
	Pages = {335-350},
	Title = {The Chubby Lock Service for Loosely-Coupled Distributed Systems},
	Year = {2006}}

@proceedings{DBLP:conf/osdi/2006,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {OSDI},
	Date-Added = {2010-04-17 23:03:01 +0200},
	Date-Modified = {2010-04-17 23:03:01 +0200},
	Publisher = {USENIX Association},
	Title = {7th Symposium on Operating Systems Design and Implementation (OSDI '06), November 6-8, Seattle, WA, USA},
	Year = {2006}}

@article{cristian95atomic,
	Author = {Cristian, F. and Aghili, H. and Strong, R. and Dolev, D.},
	Date-Added = {2010-04-17 22:25:18 +0200},
	Date-Modified = {2010-04-17 23:06:14 +0200},
	Journal = {Information and Computation},
	Number = {1},
	Pages = {158-179},
	Publisher = {Citeseer},
	Title = {Atomic broadcast: From simple message diffusion to Byzantine agreement},
	Volume = {118},
	Year = {1995},
	Bdsk-File-1 = { }}

@techreport{Flexible08,
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Date-Added = {2010-04-17 22:04:50 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Institution = {INRIA},
	Month = {April},
	Number = {RR-6516},
	Title = {{ A Flexible Undo Framework for Collaborative Editing }},
	Type = {{ Rapport de recherche INRIA }},
	Year = {2008},
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00275754/fr/}}

@techreport{WeissRR07,
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Date-Added = {2010-04-17 22:04:50 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Institution = {INRIA},
	Month = {May},
	Number = {RR-6160},
	Title = {{ Compensation in Collaborative Editing }},
	Type = {Rapport de recherche INRIA},
	Year = {2007},
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00138381/en/}}

@techreport{WookiRR07,
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Date-Added = {2010-04-17 22:04:50 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Institution = {INRIA},
	Month = {May},
	Number = {RR-6226},
	Title = {{ Wooki: a P2P Wiki-based Collaborative Writing Tool (long version) }},
	Type = {Rapport de recherche INRIA},
	Year = {2007},
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00156190/fr/}}

@techreport{Logoot08,
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Date-Added = {2010-04-17 22:04:50 +0200},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Institution = {INRIA},
	Month = {December},
	Number = {RR-6713},
	Title = {Logoot: a {P2P} collaborative editing system},
	Type = {Rapport de recherche INRIA},
	Year = {2008},
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00336191/fr/}}

@inproceedings{weiss07wooki,
	Abstract = { Wiki systems are becoming an important part of the information system of many organisations and communities. This introduce the issue of the data availability in case of failure, heavy load or off-line access. We propose to replicate wiki pages across a P2P network of wiki engines. We address the problem of consistency of replicated wiki pages in the context of a P2P wiki system. In this paper, we present the architecture and the underlying algorithms of the wooki system. Compared to traditional wikis, Wooki is P2P wiki which scales, delivers better performances and allows off-line access. },
	Address = {Nancy, France},
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Booktitle = {Web Information Systems Engineering},
	Date-Added = {2010-04-17 22:03:56 +0200},
	Date-Modified = {2011-11-25 19:28:32 +0100},
	Keywords = {WOOTO},
	Month = {December},
	Pages = {503-512},
	Publisher = {Springer},
	Title = {{ Wooki: a P2P Wiki-based Collaborative Writing Tool}},
	Year = {2007}}

@inproceedings{weiss08undo,
	Abstract = { },
	Address = {Orlando, USA},
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Booktitle = {CollaborateCom},
	Date-Added = {2010-04-17 22:03:56 +0200},
	Date-Modified = {2011-06-17 15:07:47 +0200},
	Month = {November},
	Pages = {529-544},
	Title = {{An Undo Framework for P2P Collaborative Editing }},
	Year = {2008}}

@inproceedings{WiseCR09,
	Address = {Poznan, Poland},
	Author = {Charbel Rahhal and Hala Skaf-Molli and Pascal Molli and St\'ephane Weiss},
	Booktitle = {The 10th International Conference on Web Information Systems Engineering (WISE'09)},
	Date-Added = {2010-04-17 22:03:56 +0200},
	Date-Modified = {2010-04-17 22:03:56 +0200},
	Month = {October},
	Title = {Multi-synchronous Collaborative Semantic Wikis},
	Year = {2009}}

@inproceedings{Rahhal09,
	Address = {Crete, Greece},
	Author = {Charbel Rahhal and St\'ephane Weiss and Hala Skaf-Molli and Pascal Urso and Pascal Molli},
	Booktitle = {The 4th Workshop on Semantic Wikis: The Semantic Wiki Web at the 6th Annual European Semantic Web Conference (ESWC)},
	Date-Added = {2010-04-17 22:02:39 +0200},
	Date-Modified = {2010-04-17 22:02:39 +0200},
	Month = {June},
	Title = {Undo in Peer-to-peer Semantic Wikis},
	Year = {2009}}

@inproceedings{weiss07compensation,
	Address = {Sanibel Island, USA},
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Booktitle = {9th International Workshop on Collaborative Editing Systems},
	Date-Added = {2010-04-17 22:02:39 +0200},
	Date-Modified = {2010-05-10 11:22:16 +0200},
	Month = {November},
	Title = {Compensation in collaborative editing},
	Year = {2007},
	Bdsk-File-1 = { }}

@inproceedings{RSDA,
	Address = {Nancy, France},
	Author = {St\'ephane Weiss and Pascal Urso and Pascal Molli},
	Booktitle = {Inter-Regional Workshop on Rigorous System Development and Analysis},
	Date-Added = {2010-04-17 22:02:39 +0200},
	Date-Modified = {2010-04-17 22:02:39 +0200},
	Month = {October},
	Title = {Formal method for collaborative editing : a case study},
	Year = {2007}}

@inproceedings{Ignat07,
	Author = {Claudia-Lavinia Ignat and G{\'e}rald Oster and Pascal Molli and Mich{\`e}le Cart and Jean Ferri{\'e} and Anne-Marie Kermarrec and Pierre Sutra and Marc Shapiro and Lamia Benmouffok and Jean-Michel Busca and Rachid Guerraoui},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CollaborateCom},
	Ee = {http://dx.doi.org/10.1109/COLCOM.2007.4553878},
	Pages = {474-483},
	Title = {A comparison of optimistic approaches to collaborative editing of Wiki pages},
	Year = {2007}}

@inproceedings{PSW09,
	Address = {Linz, Austria},
	Author = {Hala Skaf-Molli and Charbel Rahhal and Pascal Molli},
	Booktitle = {The 20th International Conference on Database and Expert Systems Applications - DEXA'09},
	Month = {September},
	Title = {Peer-to-peer Semantic Wikis},
	Year = {2009}}

@article{Torres99,
	Address = {London, UK},
	Author = {Torres-Rojas, Francisco J. and Ahamad, Mustaque},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Issn = {0178-2770},
	Journal = {Distrib. Comput.},
	Number = {4},
	Pages = {179--195},
	Publisher = {Springer-Verlag},
	Title = {Plausible clocks: constant size logical clocks for distributed systems},
	Volume = {12},
	Year = {1999},
	Bdsk-Url-1 = {http://dx.doi.org/10.1007/s004460050065}}

@article{DuLiTPDS07,
	Author = {Rui Li and Du Li},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Ee = {http://dx.doi.org/10.1109/TPDS.2007.35},
	Journal = {IEEE Trans. Parallel Distrib. Syst.},
	Number = {3},
	Pages = {307-319},
	Title = {A New Operational Transformation Framework for Real-Time Group Editors},
	Volume = {18},
	Year = {2007}}

@article{SpinellisL08,
	Author = {Diomidis Spinellis and Panagiotis Louridas},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Ee = {http://doi.acm.org/10.1145/1378704.1378720},
	Journal = {Commun. ACM},
	Number = {8},
	Pages = {68-73},
	Title = {The collaborative organization of knowledge},
	Volume = {51},
	Year = {2008}}

@article{kshemkalyani98necessary,
	Author = {Ajay D. Kshemkalyani and Mukesh Singhal},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Date-Modified = {2010-06-30 16:46:06 +0200},
	Ee = {http://link.springer.de/link/service/journals/00446/bibs/8011002/80110091.htm},
	Journal = {Distributed Computing},
	Keywords = {braodcast},
	Number = {2},
	Pages = {91-111},
	Title = {Necessary and Sufficient Conditions on Information for Causal Message Ordering and Their Optimal Implementation},
	Volume = {11},
	Year = {1998}}

@inproceedings{oster09cops,
	Address = {groningen, Netherlands},
	Author = {G{\'e}rald Oster and Pascal Molli and Sergiu Dumitriu and Ruben Mondejar},
	Booktitle = {Collaborative Peer-to-Peer Systems (COPS'09)},
	Date-Modified = {2013-02-27 12:03:09 +0000},
	Month = {June},
	Pages = {21},
	Title = {{UniWiki: A Reliable and Scalable Peer-to-Peer System for Distributing Wiki Applications }},
	Year = {2009}}

@inproceedings{Shapiro09,
	Address = {Montreal, Quebec, Canada},
	Author = {Nuno Pregui\c{c}a and Joan Manuel Marqu\`es and Marc Shapiro and Mihai Letia},
	Booktitle = {ICDCS},
	Month = {June},
	Publisher = {IEEE Computer Society},
	Title = {A commutative replicated data type for cooperative editing},
	Year = {2009}}

@inproceedings{SSR08,
	Address = {New York, NY, USA},
	Author = {Thorsten Sch\"{u}tt and Florian Schintke and Alexander Reinefeld},
	Booktitle = {ERLANG '08: Proceedings of the 7th ACM SIGPLAN workshop on ERLANG},
	Date-Modified = {2012-05-24 11:23:23 +0200},
	Isbn = {978-1-60558-065-4},
	Location = {Victoria, BC, Canada},
	Pages = {41--48},
	Publisher = {ACM},
	Title = {Scalaris: reliable transactional p2p key/value store},
	Year = {2008},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1411273.1411280}}

@article{SDTJCSCW08,
	Author = {Du Li and Rui Li},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Ee = {http://dx.doi.org/10.1007/s10606-005-9009-5},
	Journal = {Computer Supported Cooperative Work},
	Number = {5-6},
	Pages = {553-611},
	Title = {An Approach to Ensuring Consistency in Peer-to-Peer Real-Time Group Editors},
	Volume = {17},
	Year = {2008}}

@inproceedings{PCBCast,
	Author = {ChaYoung Kim and JinHo Ahn and Chong-Sun Hwang},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {ICCSA (4)},
	Ee = {http://springerlink.metapress.com/openurl.asp?genre=article{\&}issn=0302-9743{\&}volume=3046{\&}spage=233},
	Pages = {233-242},
	Title = {Gossip Based Causal Order Broadcast Algorithm},
	Year = {2004}}

@misc{git,
	Author = {Linus Torvalds},
	Date-Modified = {2013-02-08 12:09:19 +0000},
	Key = {git},
	Note = {{http://git-scm.com/}},
	Title = {{git}},
	Year = {(April 2005)}}

@inproceedings{DTwiki,
	Author = {Bowei Du and Eric A. Brewer},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {WWW},
	Ee = {http://doi.acm.org/10.1145/1367497.1367624},
	Pages = {945-952},
	Title = {Dtwiki: a disconnection and intermittency tolerant wiki},
	Year = {2008}}

@inproceedings{TierStore,
	Author = {Michael J. Demmer and Bowei Du and Eric A. Brewer},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {FAST},
	Ee = {http://www.usenix.org/events/fast08/tech/demmer.html},
	Pages = {35-48},
	Title = {TierStore: A Distributed Filesystem for Challenged Networks in Developing Regions},
	Year = {2008}}

@inproceedings{Neuman94,
	Author = {B. Clifford Neuman},
	Booktitle = {Readings in Distributed Computing Systems},
	Pages = {463--489},
	Publisher = {IEEE Computer Society Press},
	Title = {Scale in distributed systems},
	Year = {1994}}

@inproceedings{Morris07,
	Author = {Joseph C. Morris},
	Booktitle = {Int. Sym. Wikis},
	Ee = {http://doi.acm.org/10.1145/1296951.1296959},
	Pages = {69-74},
	Title = {DistriWiki: : a distributed peer-to-peer wiki network},
	Year = {2007}}

@article{PrakashRS97,
	Author = {Ravi Prakash and Michel Raynal and Mukesh Singhal},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Journal = {J. Parallel Distrib. Comput.},
	Number = {2},
	Pages = {190-204},
	Title = {An Adaptive Causal Ordering Algorithm Suited to Mobile Computing Environments},
	Volume = {41},
	Year = {1997}}

@inproceedings{oster06data,
	Address = {Banff, Alberta, Canada},
	Author = {G{\'e}rald Oster and Pascal Urso and Pascal Molli and Abdessamad Imine},
	Booktitle = {Proceedings of the ACM Conference on Computer-Supported Cooperative Work - CSCW 2006},
	Date-Modified = {2010-06-21 10:34:03 +0200},
	Keywords = {woot},
	Month = {nov},
	Pages = {259--267},
	Pdf = {OsterCSCW06.pdf},
	Publisher = {ACM Press},
	Title = {{Data Consistency for P2P Collaborative Editing}},
	Year = {2006}}

@techreport{Shapiro07,
	Author = {Marc Shapiro and Nuno Pregui{\c c}a},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Institution = {INRIA},
	Month = {October},
	Number = {RR-6320},
	Title = {Designing a commutative replicated data type},
	Type = {Rapport de recherche INRIA},
	Year = {2007},
	Bdsk-Url-1 = {http://hal.inria.fr/inria-00177693/fr/}}

@article{Eugster03,
	Address = {New York, NY, USA},
	Author = {P. Th. Eugster and R. Guerraoui and S. B. Handurukande and P. Kouznetsov and A.-M. Kermarrec},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0734-2071},
	Journal = {ACM Trans. Comput. Syst.},
	Number = {4},
	Pages = {341--374},
	Publisher = {ACM Press},
	Title = {Lightweight probabilistic broadcast},
	Volume = {21},
	Year = {2003},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/945506.945507}}

@inproceedings{RohKL06,
	Author = {Hyun-Gul Roh and Jinsoo Kim and Joonwon Lee},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {JCIS},
	Ee = {http://dx.doi.org/10.2991/jcis.2006.245},
	Title = {How to Design Optimistic Operations for Peer-to-Peer Replication},
	Year = {2006}}

@book{collinssussman2007SVN,
	Author = {Ben Collins-Sussman and Brian W. Fitzpatrick and C. Michael Pilato},
	Date-Modified = {2012-07-23 10:24:22 +0200},
	Publisher = {O'Reilly Media},
	Title = {Version Control with Subversion},
	Year = {2007},
	Bdsk-Url-1 = {http://svnbook.red-bean.com/}}

@unpublished{repliwiki,
	Author = {Brent ByungHoon Kang and Carson Robert Black and Sravanthi Aangi-Reddy and Alaa El Masri},
	Note = {(Unpublished) \url{http://isr.uncc.edu/repliwiki/repliwiki - conference.pdf}},
	Title = {RepliWiki: A Next Generation Architecture for Wikipedia}}

@inproceedings{abowd91giving,
	Author = {Abowd, Gregory D and Dix,Alan J},
	Date-Modified = {2010-06-22 11:01:55 +0200},
	Journal = {CSCW},
	Pages = {32321},
	Title = {Giving undo attention},
	Volume = {777},
	Year = {1991}}

@article{abowd92undo,
	Author = {Gregory D. Abowd and Alan J. Dix},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Date-Modified = {2010-05-10 09:49:26 +0200},
	Journal = {Interacting with Computers},
	Number = {3},
	Pages = {317-342},
	Title = {Giving Undo Attention},
	Volume = {4},
	Year = {1992},
	Bdsk-File-1 = { }}

@article{lamport78time,
	Author = {Leslie Lamport},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Date-Modified = {2011-12-02 10:26:41 +0100},
	Journal = {Commun. ACM},
	Number = {7},
	Pages = {558-565},
	Title = {Time, Clocks, and the Ordering of Events in a Distributed System.},
	Volume = {21},
	Year = {1978}}

@inproceedings{Berlage93,
	Author = {Thomas Berlage and Andreas Genau},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {ACM Symposium on User Interface Software and Technology},
	Ee = {http://doi.acm.org/10.1145/168642.168668},
	Pages = {249-257},
	Title = {A Framework for Shared Applications with a Replicated Architecture.},
	Year = {1993}}

@inproceedings{Sun97,
	Author = {Chengzheng Sun and Yanchun Zhang and Xiaohua Jia and Yun Yang},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {GROUP},
	Crossref = {DBLP:conf/group/1997},
	Ee = {http://doi.acm.org/10.1145/266838.267366},
	Pages = {425-434},
	Title = {A generic operation transformation scheme for consistency maintenance in real-time cooperative editing systems.},
	Year = {1997}}

@proceedings{DBLP:conf/group/1997,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {GROUP},
	Publisher = {ACM},
	Title = {Proceedings of GROUP'97, International Conference on Supporting Group Work: The Integration Challenge, November 16-19, 1997, Embassy Suites Hotel, Phoenix, Arizona, USA},
	Year = {1997}}

@article{Chen04,
	Author = {David Chen and Chengzheng Sun},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CDVE},
	Ee = {http://springerlink.metapress.com/openurl.asp?genre=article{\&}issn=0302-9743{\&}volume=3190{\&}spage=196},
	Pages = {196},
	Title = {Comparison of Real-Time Text Chat and Collaborative Editing Systems.},
	Year = {2004}}

@article{Lin05,
	Author = {Kai Lin and David Chen and Chengzheng Sun and R. Geoff Dromey},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CDVE},
	Ee = {http://dx.doi.org/10.1007/11555223_12},
	Pages = {103-110},
	Title = {A Constraint Maintenance Strategy and Applications in Real-Time Collaborative Environments.},
	Year = {2005}}

@inproceedings{ressel96integrating,
	Author = {Matthias Ressel and Doris Nitsche-Ruhland and Rul Gunzenh{\"a}user},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CSCW},
	Date-Modified = {2011-07-22 13:33:39 +0200},
	Ee = {http://doi.acm.org/10.1145/240080.240305},
	Keywords = {adopted, OT},
	Pages = {288-297},
	Title = {An Integrating, Transformation-Oriented Approach to Concurrency Control and Undo in Group Editors.},
	Year = {1996},
	Bdsk-File-1 = { }}

@inproceedings{molli03using,
	Address = {Sanibel Island, Florida, USA},
	Author = {Pascal Molli and G{\'e}rald Oster and Hala Skaf-Molli and Abdessamad Imine},
	Booktitle = {Proceedings of the ACM SIGGROUP Conference on Supporting Group Work - GROUP 2003},
	Date-Modified = {2013-02-04 14:49:56 +0000},
	Isbn = {1-58113-693-5},
	Keywords = {so6},
	Month = {November},
	Pages = {212--220},
	Publisher = {ACM Press},
	Title = {Using the Transformational Approach to Build a Safe and Generic Data Synchronizer},
	Year = {2003},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/958160.958194}}

@inproceedings{kang03,
	Author = {Brent ByungHoon Kang and Robert Wilensky and John Kubiatowicz},
	Booktitle = {23rd IEEE International Conference on Distributed Computing Systems {(ICDCS'03)}},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Title = {Hash History Approach for Reconciling Mutual Inconsistency in Optimistic Replication},
	Year = 2003,
	Bdsk-Url-1 = {citeseer.ist.psu.edu/kang03hash.html}}

@techreport{TTF,
	Author = {G\'erald Oster and Pascal Urso and Pascal Molli},
	Clef_Labo = {1080},
	Http = {http://www.inria.fr/rrrt/rr-5795.html},
	Institution = {INRIA},
	Month = DEC,
	Number = {5795},
	Title = {Proving correctness of transformation functions in collaborative editing systems},
	Topics = {ECOO CASSIS},
	Type = {Rapport de Recherche},
	Type_Publi = {interne},
	Year = 2005}

@inproceedings{ellis89concurrency,
	Author = {Clarence A. Ellis and Simon J. Gibbs},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {SIGMOD Conference},
	Crossref = {DBLP:conf/sigmod/89},
	Date-Modified = {2010-06-11 10:30:15 +0200},
	Ee = {http://doi.acm.org/10.1145/67544.66963, db/conf/sigmod/EllisG89.html},
	Pages = {399-407},
	Title = {Concurrency Control in Groupware Systems.},
	Year = {1989},
	Bdsk-File-1 = { }}

@proceedings{DBLP:conf/sigmod/89,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Editor = {James Clifford and Bruce G. Lindsay and David Maier},
	Publisher = {ACM Press},
	Title = {Proceedings of the 1989 ACM SIGMOD International Conference on Management of Data, Portland, Oregon, May 31 - June 2, 1989.},
	Year = {1989}}

@article{Sun96distributedconcurrency,
	Author = {C. Sun and Y. Yang and Y. Zhang and D. Chen},
	Title = {Distributed Concurrency Control in Real-time Cooperative Editing Systems},
	Year = {1996}}

@article{Prakash94,
	Author = {Atul Prakash and Michael J. Knister},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Ee = {http://doi.acm.org/10.1145/198425.198427},
	Journal = {ACM Trans. Comput.-Hum. Interact.},
	Number = {4},
	Pages = {295-330},
	Title = {A Framework for Undoing Actions in Collaborative Systems.},
	Volume = {1},
	Year = {1994}}

@inproceedings{DBLP:conf/rta/BartheS03,
	Author = {Gilles Barthe and Sorin Stratulat},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {RTA},
	Ee = {http://link.springer.de/link/service/series/0558/bibs/2706/27060337.htm},
	Pages = {337-351},
	Title = {Validation of the JavaCard Platform with Implicit Induction Techniques.},
	Year = {2003}}

@proceedings{rta2003,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {RTA},
	Editor = {Robert Nieuwenhuis},
	Isbn = {3-540-40254-3},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Rewriting Techniques and Applications, 14th International Conference, RTA 2003, Valencia, Spain, June 9-11, 2003, Proceedings},
	Volume = {2706},
	Year = {2003}}

@article{jsc2001,
	Author = {Sorin Stratulat},
	Bibsource = {DBLP, http://dblp.uni-trier.d},
	Journal = {J. Symb. Comput.},
	Month = {September},
	Number = {4},
	Pages = {403-445},
	Title = {A General Framework to Build Contextual Cover Set Induction Provers.},
	Volume = {32},
	Year = {2001}}

@inproceedings{xia04coword,
	Author = {Steven Xia and David Sun and Chengzheng Sun and David Chen and Haifeng Shen},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CSCW},
	Crossref = {DBLP:conf/cscw/2004},
	Date-Modified = {2012-04-12 15:54:54 +0200},
	Ee = {http://doi.acm.org/10.1145/1031607.1031635},
	Pages = {162-171},
	Title = {Leveraging single-user applications for multi-user collaboration: the coword approach.},
	Year = {2004}}

@proceedings{DBLP:conf/cscw/2004,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {CSCW},
	Editor = {James D. Herbsleb and Gary M. Olson},
	Isbn = {1-58113-810-5},
	Publisher = {ACM},
	Title = {Proceedings of the 2004 ACM Conference on Computer Supported Cooperative Work, CSCW 2004, Chicago, Illinois, USA, November 6-10, 2004},
	Year = {2004}}

@article{SunTPDS02,
	Address = {Los Alamitos, CA, USA},
	Author = {Chengzheng Sun},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {1045-9219},
	Journal = {IEEE Transactions on Parallel and Distributed Systems},
	Number = {9},
	Pages = {994-1008},
	Publisher = {IEEE Computer Society},
	Title = {Optional and Responsive Fine-Grain Locking in Internet-Based Collaborative Systems},
	Volume = {13},
	Year = {2002},
	Bdsk-Url-1 = {http://doi.ieeecomputersociety.org/10.1109/TPDS.2002.1036072}}

@inproceedings{mattern89virtual,
	Address = {Ch{\^a}teau de Bonas, France},
	Author = {Friedemann Mattern},
	Booktitle = {Proceedings of the International Workshop on Parallel and Distributed Algorithms},
	Date-Modified = {2010-12-06 14:16:51 +0100},
	Editor = {Michel Cosnard et al.},
	Month = october,
	Pages = {215--226},
	Publisher = {Elsevier Science Publishers},
	Title = {Virtual Time and Global States of Distributed Systems},
	Year = {1989},
	Bdsk-File-1 = { }}

@book{Bernstein87,
	Author = {Philip A. Bernstein and Vassos Hadzilacos and Nathan Goodman},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Note = {{ISBN 0-201-10715-5}},
	Publisher = {Addison-Wesley},
	Title = {Concurrency Control and Recovery in Database Systems},
	Year = {1987},
	Bdsk-Url-1 = {http://research.microsoft.com/pubs/ccontrol}}

@article{saito05optimistic,
	Abstract = {Data replication is a key technology in distributed data sharing systems, enabling higher availability and performance. This paper surveys optimistic replication algorithms that allow replica contents to diverge in the short term, in order to support concurrent work practices and to tolerate failures in low-quality communication links. The importance of such techniques is increasing as collaboration through wide-area and mobile networks becomes popular. Optimistic replication techniques are different from traditional "pessimistic" ones. Instead of synchronous replica coordination, an optimistic algorithm propagates changes in the background, discovers conflicts after they happen and reaches agreement on the final contents incrementally. We explore the solution space for optimistic replication algorithms. This paper identifies key challenges facing optimistic replication systems -- ordering operations, detecting and resolving conflicts, propagating changes efficiently, and bounding replica divergence -- and provides a comprehensive survey of techniques developed for addressing these challenges.},
	Address = {New York, New York, {\'E}tats-Unis},
	Author = {Yasushi Saito and Marc Shapiro},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0360-0300},
	Journal = {ACM Computing Surveys},
	Number = {1},
	Pages = {42--81},
	Publisher = {ACM Press},
	Title = {Optimistic replication},
	Volume = {37},
	Year = {2005},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1057977.1057980}}

@inproceedings{Demers87,
	Author = {Alan Demers and Dan Greene and Carl Hauser and Wes Irish and John Larson and Scott Shenkcr and Howard Sturgis and Dan Swinehart and Doug Terry},
	Booktitle = {Proceedings of the sixteenth annual ACM Symposium on Principles of Distributed Computing - PODC'87},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {0-89791-239-4},
	Location = {Vancouver, British Columbia, Canada},
	Pages = {1--12},
	Publisher = {ACM Press},
	Title = {Epidemic Algorithms for Replicated Database Maintenance},
	Year = {1987},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/41840.41841}}

@inproceedings{Berliner90,
	Address = {Berkeley, Californie, {\'E}tats-Unis},
	Author = {Brian Berliner},
	Booktitle = {Proceedings of the {USENIX} Winter 1990 Technical Conference},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Pages = {341--352},
	Publisher = {USENIX Association},
	Title = {{CVS} {II}: Parallelizing Software Development},
	Year = {1990},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/berliner90cvs.html}}

@book{cederqvist02cvs,
	Author = {Per Cederqvist},
	Date-Modified = {2012-04-12 16:04:34 +0200},
	Month = december,
	Publisher = {Network Theory Ltd.},
	Title = {Version Management with CVS},
	Year = {2002}}

@inproceedings{Kawell88,
	Address = {New York, New York, {\'E}tats-Unis},
	Author = {Leonard Kawell Jr. and Steven Beckhardt and Timothy Halvorsen and Raymond Ozzie and Irene Greif},
	Booktitle = {Proceedings of the {ACM} conference on Computer-supported cooperative work - CSCW'88},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {0-89791-282-9},
	Location = {Portland, Oregon, {\'E}tats-Unis},
	Pages = {395},
	Publisher = {ACM Press},
	Title = {Replicated document management in a group communication system},
	Year = {1988},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/62266.1024798}}

@article{Defago04,
	Author = {Xavier D{\'e}fago and Andr{\'e} Schiper and P{\'e}ter Urb\'an},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0360-0300},
	Journal = {ACM Computing Surveys},
	Number = {4},
	Pages = {372--421},
	Publisher = {ACM Press},
	Title = {Total order broadcast and multicast algorithms: Taxonomy and survey},
	Volume = {36},
	Year = {2004},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1041680.1041682}}

@inproceedings{Ladin90,
	Author = {Rivka Ladin and Barbara Liskov and Liuba Shrira},
	Booktitle = {{IEEE} Computer Society Technical Committee on Operating Systems and Application Environments},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Number = {3},
	Pages = {4--7},
	Publisher = {{IEEE} Computer Society},
	Title = {Lazy Replication: Exploiting the Semantics of Distributed Services},
	Volume = {4},
	Year = {1990},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/ladin90lazy.html}}

@article{lushman03proof,
	Address = {Amsterdam, Hollande},
	Author = {Brad Lushman and Gordon V. Cormack},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0020-0190},
	Journal = {Information Processing Letters},
	Keywords = {OT},
	Number = {6},
	Pages = {303--310},
	Publisher = {Elsevier North-Holland, Inc.},
	Title = {Proof of correctness of {R}essel's {adOPTed} algorithm},
	Volume = {86},
	Year = {2003},
	Bdsk-Url-1 = {http://dx.doi.org/10.1016/S0020-0190(03)00227-8}}

@inproceedings{suleiman98concurrent,
	Address = {Orlando, Floride, {\'E}tats-Unis},
	Author = {Maher Suleiman and Mich{\`e}le Cart and Jean Ferri{\'e}},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {Proceedings of the fourteenth International Conference on Data Engineering - ICDE'98},
	Date-Modified = {2013-02-06 09:56:56 +0000},
	Isbn = {0-8186-8289-2},
	Month = february,
	Pages = {36-45},
	Publisher = {IEEE Computer Society},
	Title = {Concurrent Operations in a Distributed and Mobile Collaborative Environment},
	Year = {1998}}

@article{sun98tochi,
	Author = {Chengzheng Sun and Xiaohua Jia and Yanchun Zhang and Yun Yang and David Chen},
	Date-Modified = {2012-07-24 10:10:27 +0200},
	Issn = {1073-0516},
	Journal = {ACM Transactions on Computer-Human Interaction (TOCHI)},
	Keywords = {high-responsivness CCI puzzle},
	Month = march,
	Number = {1},
	Pages = {63--108},
	Publisher = {ACM Press},
	Title = {Achieving convergence, causality preservation, and intention preservation in real-time cooperative editing systems},
	Volume = {5},
	Year = {1998},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/274444.274447}}

@inproceedings{sun98operational,
	Address = {New York, New York, {\'E}tats-Unis},
	Author = {Chengzheng Sun and Clarence A. Ellis},
	Booktitle = {Proceedings of the {ACM} Conference on Computer Supported Cooperative Work - CSCW'98},
	Date-Modified = {2013-02-06 09:55:31 +0000},
	Isbn = {1-58113-009-0},
	Keywords = {GOTO},
	Location = {Seattle, Washington, {\'E}tats-Unis},
	Month = november,
	Pages = {59--68},
	Publisher = {ACM Press},
	Title = {Operational Transformation in Real-Time Group Editors: Issues, Algorithms, and Achievements.},
	Year = {1998},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/289444.289469}}

@article{Sun.ea:02,
	Author = {Chengzheng Sun and David Chen},
	Journal = {ACM Transactions on Computer-Human Interaction (TOCHI)},
	Month = march,
	Number = 1,
	Pages = {1-41},
	Publisher = {ACM Press},
	Title = {Consistency maintenance in real-time collaborative graphics editing systems},
	Volume = 9,
	Year = 2002}

@inproceedings{Li04,
	Abstract = {Realtime group editors allow distributed users to work on local replicas of a shared document simultaneously to achieve high responsiveness and free interaction. Operational transformation (OT) is the standard method for consistency maintenance in state-of-the-art group editors. It is potentially able to achieve content consistency (convergence) as well as intention consistency (so that the converged content is what the users intend), while traditional concurrency control methods such as locking and serialization often cannot. However, existing OT algorithms are often not able to really guarantee consistency due to important algorithmic flaws that have been there for fourteen years. We present a novel state difference based transformation (SDT) algorithm to solve the problem. Our result also reveals that the standard priority schemes to break ties in distributed systems should be used with more caution.},
	Address = {Hachioji, Tokyo, Japon},
	Author = {Du Li and Rui Li},
	Bibsource = {http://csdl.computer.org/comp/proceedings/icdcs/2004/2086/00/20860748abs.htm},
	Booktitle = {Proceedings of the twenty fourth International Conference on Distributed Computing Systems - ICDCS'04},
	Month = march,
	Pages = {748-755},
	Publisher = {IEEE Computer Society},
	Title = {Ensuring Content and Intention Consistency in Real-Time Group Editors},
	Year = {2004}}

@inproceedings{Li04b,
	Abstract = {Consistency maintenance is a critical and challenging issue in many interactive groupware applications that can be modeled as group editors. This paper addresses two open consistency problems: divergence and operation effects relation violation. While the former has been partly solved, the latter has never been addressed in any published work. We propose a novel approach to solving both problems in the same framework. Particularly it preserves the effects relation of concurrent operations so that convergence is achieved automatically. Our work provides a new perspective into group editors and operational transformation algorithms.},
	Author = {Du Li and Rui Li},
	Booktitle = {Proceedings of the ACM conference on Computer Supported Cooperative Work - CSCW '04},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {1-58113-810-5},
	Location = {Chicago, Illinois, {\'E}tats-Unis},
	Pages = {457--466},
	Publisher = {ACM Press},
	Title = {Preserving operation effects relation in group editors},
	Year = {2004},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1031607.1031683}}

@inproceedings{sun06operation,
	Address = {Banff, Alberta, Canada},
	Author = {David Sun and Chengzheng Sun},
	Booktitle = {Proceedings of the ACM Conference on Computer-Supported Cooperative Work - CSCW 2006},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {1-59593-249-6},
	Keywords = {COT},
	Month = nov,
	Pages = {279--288},
	Publisher = {ACM Press},
	Title = {{Operation Context and Context-based Operational Transformation}},
	Year = {2006},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1180875.1180918}}

@inproceedings{Davis02,
	Address = {New York, New York, {\'E}tats-Unis},
	Author = {Aguido Horatio Davis and Chengzheng Sun and Junwei Lu},
	Booktitle = {Proceedings of the ACM conference on Computer supported cooperative work - CSCW'02},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {1-58113-560-2},
	Location = {Nouvelle Orl{\'e}ans, Louisiane, {\'E}tats-Unis},
	Pages = {58--67},
	Publisher = {ACM Press},
	Title = {Generalizing operational transformation to the {S}tandard {G}eneral {M}arkup {L}anguage},
	Year = {2002},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/587078.587088}}

@article{sun02inverse,
	Author = {Chengzheng Sun},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {1073-0516},
	Journal = {ACM Transactions on Computer-Human Interaction (TOCHI)},
	Keywords = {puzzle},
	Month = december,
	Number = {4},
	Pages = {309--361},
	Publisher = {ACM Press},
	Title = {Undo as concurrent inverse in group editors},
	Volume = {9},
	Year = {2002},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/586081.586085}}

@inproceedings{oster06tombstone,
	Abstract = { In collaborative editing, consistency maintenance of the copies of shared data is a critical issue. In the last decade, Operational Transformation (OT) approach revealed as a suitable mechanism for maintaining consistency. Unfortunately, none of the published propositions relying on this approach are able to satisfy the mandatory correctness properties $TP_1$ and $TP_2$ defined in the Ressel's framework. This paper addresses this correctness issue by proposing a new way to model shared state by retaining tombstones when elements are removed. An instantiation of the proposed model for a linear data structure and the related transformation functions are provided. },
	Address = {Atlanta, Georgia, USA},
	Author = {G{\'e}rald Oster and Pascal Urso and Pascal Molli and Abdessamad Imine},
	Booktitle = {The Second International Conference on Collaborative Computing: Networking, Applications and Worksharing (CollaborateCom 2006)},
	Date-Modified = {2011-07-22 13:33:47 +0200},
	Keywords = {ttf, OT},
	Month = {November},
	Publisher = {IEEE Press},
	Title = {Tombstone Transformation Functions for Ensuring Consistency in Collaborative Editing Systems},
	Year = {2006},
	Bdsk-File-1 = { }}

@inproceedings{Ferrie04,
	Author = {Jean Ferri\'e and Nicolas Vidot and Mich\`ele Cart},
	Booktitle = {On the Move to Meaningful Internet Systems 2004: CoopIS, DOA, and ODBASE - OTM Confederated International Conferences, CoopIS, DOA, ODBASE 2004},
	Ee = {http://springerlink.metapress.com/openurl.asp?genre=article{\&}issn=0302-9743{\&}volume=3290{\&}spage=155},
	Location = {Agia Napa, Chipre},
	Month = november,
	Pages = {155-173},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Concurrent Undo Operations in Collaborative Environments Using Operational Transformation.},
	Volume = {3290},
	Year = {2004}}

@article{Bouhoula96,
	Author = {Adel Bouhoula},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Ee = {http://dx.doi.org/10.1016/S0304-3975(96)80708-0},
	Journal = {Theoretical Computer Science},
	Number = {1-2},
	Pages = {245-276},
	Title = {Using Induction and Rewriting to Verify and Complete Parameterized Specifications.},
	Volume = {170},
	Year = {1996}}

@inproceedings{Li00anew,
	Author = {Du Li and Limin Zhou and Richard R. Muntz},
	Title = {A New Paradigm of User Intention Preservation in Realtime Collaborative Editing Systems},
	Year = {2000}}

@inproceedings{Bouhoula93,
	Author = {Adel Bouhoula and Micha{\"e}l Rusinowitch},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {Proceedings of the thirteenth International Joint Conference on Artificial Intelligence - IJCAI'93},
	Location = {Chamb{\'e}ry, France},
	Month = september,
	Pages = {88-94},
	Title = {Automatic Case Analysis in Proof by Induction},
	Year = {1993}}

@article{Stratulat01,
	Abstract = { Cover set induction is known as a proof method that keeps the advantages of explicit induction and proof by consistency. Most implicit induction proof procedures are defined in a cover set induction framework. Contextual cover set (CCS) is a new concept that fully characterizes explicit induction schemes, such as the cover sets, and many simplification techniques as those specific to the "proof by consistency' approach. Firstly, we present an abstract inference system uniformly defined in terms of contextual cover sets as our general framework to build implicit induction provers. Then, we show that it generalizes existing cover set induction procedures. This paper also contributes to the general problem of assembling reasoning systems in a sound manner. Elementary CCSs are generated by reasoning modules that implement various simplification techniques defined for a large class of deduction mechanisms such as rewriting, conditional rewriting and resolution-based methods for clauses. We present a generic and sound integration schema of reasoning modules inside our procedure together with a simple methodology for improvements and incremental sound extensions of the concrete proof procedures. As a case study, the inference system of the SPIKE theorem prover has been shown to be an instance of the abstract inference system integrating reasoning modules based on rewriting techniques defined for conditional theories. Our framework allows for modular and incremental sound extensions of SPIKE when new reasoning techniques are proposed. An extension of the prover, incorporating inductive semantic subsumption techniques, has proved the correctness of the MJRTY algorithm by performing a combination of arithmetic and inductive reasoning.},
	Author = {Sorin Stratulat},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0747-7171},
	Journal = {Journal of Symbolic Computation},
	Number = {4},
	Pages = {403--445},
	Publisher = {Academic Press, Inc.},
	Title = {A general framework to build contextual cover set},
	Volume = {32},
	Year = {2001},
	Bdsk-Url-1 = {http://dx.doi.org/10.1006/jsco.2000.0469}}

@phdthesis{SuleimanThesis,
	Author = {Maher Suleiman},
	School = {Universit{\'e} de Montpellier II},
	Title = {S{\'e}rialisation des Op{\'e}rations Concurrentes dans les Syst{\`e}mes Collaboratifs R{\'e}partis},
	Year = {1998}}

@phdthesis{VidotThesis,
	Author = {Nicolas Vidot},
	Month = september,
	School = {Universit\'e de Montpellier II},
	Title = {Convergence des Copies dans un Environnements Collaboratifs R\'epartis},
	Year = {2002}}

@inproceedings{Allison94,
	Address = {Pittsburgh, Pennsylvanie, {\'E}tats-Unis},
	Author = {Allison Colin},
	Booktitle = {Proceedings of the Concurrent Engineering : Research and Applications. A Global perspectives - CE'94},
	Month = august,
	Pages = {163--170},
	Title = {Concurrency Control for Real Time Groupware},
	Year = {1994}}

@inproceedings{Sandberg85,
	Address = {Portland, Oregon, {\'E}tats-Unis},
	Author = {Russel Sandberg and David Goldberg and Steve Kleiman and Dan Walsh and Bob Lyon},
	Booktitle = {Proc.\ Summer 1985 {USENIX} Conf.},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Pages = {119--130},
	Title = {Design and Implementation of the {S}un {N}etwork {F}ilesystem},
	Year = {1985},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/sandberg85design.html}}

@article{Howard88,
	Author = {John H. Howard and Michael L. Kazar and Sherri G. Menees and David A. Nichols and M. Satyanarayanan and Robert N. Sidebotham and Michael J. West},
	Journal = {ACM Transactions Computer Systems},
	Month = february,
	Number = {1},
	Pages = {51--81},
	Title = {Scale and Performance in a Distributed File System},
	Volume = {6},
	Year = {1988}}

@inproceedings{Kistler91,
	Address = {Asilomar Conference Center, Pacific Grove, {\'E}tats-Unis},
	Author = {James J. Kistler and Mahadev Satyanarayanan},
	Booktitle = {thirteenth {ACM} Symposium on Operating Systems Principles},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Pages = {213--225},
	Publisher = {ACM Press},
	Title = {Disconnected Operation in the {Coda} File System},
	Volume = {25},
	Year = {1991},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/kistler92disconnected.html}}

@inproceedings{Kumar95,
	Author = {Puneet Kumar and Mahadev Satyanarayanan},
	Booktitle = {{USENIX} Winter},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Pages = {95-106},
	Title = {Flexible and Safe Resolution of File Conflicts},
	Year = {1995},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/kumar95flexible.html}}

@inproceedings{KarsentyB93,
	Author = {Alain Karsenty and Michel Beaudouin-Lafon},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {ICDCS},
	Pages = {195-202},
	Title = {An Algorithm for Distributed Groupware Applications},
	Year = {1993}}

@inproceedings{kumar93coda,
	Address = {San Diego, Californie, {\'E}tats-Unis},
	Author = {Puneet Kumar and Mahadev Satyanarayanan},
	Booktitle = {Proceedings of the Second International Conference on Parallel and Distributed Information Systems},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Keywords = {eventual consistency},
	Pages = {202--213},
	Title = {Log-Based Directory Resolution in the {C}oda File System},
	Year = {1993},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/kumar93logbased.html}}

@inproceedings{Braam99,
	Address = {Monterey, Canada},
	Author = {Peter J. Braam and Michael J. Callahan and Phil Schwan},
	Booktitle = {The O'Reilly Perl Conference 3.0},
	Month = august,
	Organization = {O'Reilly Open Source Convention},
	Title = {The {InterMezzo} File System},
	Year = {1999}}

@book{Peano89,
	Address = {Turin},
	Author = {Giuseppe Peano},
	Title = {Arithmetices principia novo methodo exposita},
	Year = {1889}}

@inproceedings{PVS92,
	Address = {Londres, Royaume Unis},
	Author = {Sam Owre and John M. Rushby and Natarajan Shankar},
	Booktitle = {Proceedings of the eleventh International Conference on Automated Deduction - CADE'11},
	Isbn = {3-540-55602-8},
	Pages = {748--752},
	Publisher = {Springer-Verlag},
	Title = {{PVS}: A Prototype Verification System},
	Year = {1992}}

@manual{Coq05,
	Author = {Projet {INRIA} {LogiCal}},
	Note = {\verb+http://coq.inria.fr/doc/main.html+},
	Title = {The {Coq} Proof Assistant Reference Manual},
	Year = {(Septembre 2005)}}

@misc{Diff3,
	Author = {Free~Software~Foundation. GNU},
	Date-Modified = {2013-07-26 08:14:45 +0000},
	Key = {Diff3},
	Title = {{Diff3}. {T}hree way file comparison program},
	Url = {\verb+http://www.gnu.org/software/diffutils/diffutils.html+},
	Year = {(Septembre 2005)},
	Bdsk-Url-1 = {%5Cverb+http://www.gnu.org/software/diffutils/diffutils.html+}}

@book{Diff_book,
	Author = {David MacKenzie Paul Eggert and Richard Stallman},
	Isbn = {0-9541617-5-0},
	Month = january,
	Pages = {120},
	Publisher = {Network Theory Ltd},
	Title = {Comparing and Merging Files with GNU diff and patch},
	Year = {2003}}

@misc{Wiki,
	Author = {Ward Cunningham},
	Key = {WikiWikiWeb},
	Note = {\\ \verb+http://c2.com/cgi/wiki?WikiHistory+},
	Title = {WikiWikiWeb History},
	Year = {(Septembre 2005)}}

@misc{Wikipedia,
	Author = {Wikimedia},
	Journal = {\\ \verb+http://www.wikipedia.org/+},
	Title = {Wikipedia. {T}he free encyclopedia that anyone can edit},
	Year = {(Septembre 2005)}}

@misc{WikipediaStats,
	Author = {Wikimedia},
	Journal = {\\ \verb+http://meta.wikimedia.org/wiki/Statistics+},
	Title = {Wikipedia Statistics},
	Year = {(Septembre 2005)}}

@misc{WikipediaArchitecture,
	Author = {Wikimedia},
	Journal = {\\ \verb+http://meta.wikimedia.org/wiki/Wikimedia_servers+},
	Title = {Wikipedia Architecture},
	Year = {(Septembre 2005)}}

@inproceedings{TLC,
	Author = {Yuan Yu and Panagiotis Manolios and Leslie Lamport},
	Booktitle = {Proceedings of Correct Hardware Design and Verification Methods - CHARME'99},
	Pages = {54-66},
	Title = {Model Checking {TLA+} Specifications},
	Year = {1999}}

@inproceedings{Daniels94,
	Address = {New York, New York, {\'E}tats-Unis},
	Author = {Dean Daniels and Lip Boon Doo and Alan Downing and Curtis Elsbernd and Gary Hallmark and Sandeep Jain and Bob Jenkins and Peter Lim and Gordon Smith and Benny Souder and Jim Stamos},
	Booktitle = {Proceedings of the 1994 ACM SIGMOD International Conference on Management of data - SIGMOD'94},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {0-89791-639-5},
	Location = {Minneapolis, Minnesota, {\'E}tats-Unis},
	Pages = {467},
	Publisher = {ACM Press},
	Title = {Oracle's symmetric replication technology and implications for application design},
	Year = {1994},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/191839.191930}}

@manual{OracleReplication01,
	Author = {Oracle},
	Month = june,
	Organization = {Oracle Corporation},
	Title = {Oracle 9i Replication},
	Year = {2001}}

@misc{ActiveSync,
	Author = {Microsoft},
	Key = {ActiveSync},
	Note = {\\ \verb+http://www.microsoft.com/windowsmobile/downloads/activesync38.mspx+},
	Title = {{Microsoft ActiveSync}},
	Year = {(Septembre 2005)}}

@misc{ISync,
	Author = {Apple},
	Note = {\verb+http://www.apple.com/macosx/features/isync/+},
	Title = {{Apple iSync}. {M}ore ways to sync your digital life},
	Year = {(Septembre 2005)}}

@misc{HotSync,
	Author = {Palm},
	Key = {HotSync},
	Note = {\\ \verb+http://www.palm.com/us/support/hotsync.html+},
	Title = {{Palm HotSync}},
	Year = {(Septembre 2005)}}

@misc{J2EE,
	Author = {Sun Microsystems},
	Key = {J2EE},
	Note = {\verb+http://java.sun.com/j2ee/+},
	Title = {{Java 2 Platform Enterprise Edition}},
	Year = {(Septembre 2005)}}

@misc{Subversion,
	Author = {CollabNet},
	Key = {Subversion},
	Note = {\\ \verb+http://subversion.tigris.org/+},
	Title = {{Subversion}},
	Year = {(Septembre 2005)}}

@misc{ClearCase,
	Author = {IBM},
	Key = {ClearCase},
	Note = {\\ \verb+http://www.ibm.com/software/awdtools/clearcase/+},
	Title = {{Rational ClearCase}},
	Year = {(Septembre 2005)}}

@inproceedings{Allen95,
	Author = {Larry Allen and Gary Fernandez and Kenneth Kane and David Leblang and Debra Minard and John Posner},
	Booktitle = {{Software Configuration Management: selected papers of the ICSE SCM-4 and SCM-5 Workshops}},
	Month = oct,
	Number = {1005},
	Pages = {194--214},
	Publisher = {Springer-Verlag},
	Series = {Lecture Notes in Computer Science},
	Title = {{ClearCase} {MultiSite}: Supporting Geographically-Distributed Software Development},
	Year = {1995}}

@misc{RFC0677,
	Author = {Paul R. Johnson and Robert H. Thomas},
	Date-Modified = {2012-07-23 11:47:10 +0200},
	Day = {27},
	Keywords = {lww, tombstone, cdrt},
	Month = jan,
	Note = {\url{http://www.ietf.org/rfc/rfc677.txt}},
	Title = {{RFC 677}: Maintenance of duplicate databases},
	Year = {1975, (Septembre 2005)}}

@incollection{McCarthy69,
	Author = {John McCarthy and Patrick J. Hayes},
	Booktitle = {Machine Intelligence 4},
	Pages = {463--502},
	Publisher = {Edinburgh University Press},
	Title = {Some Philosophical Problems from the Standpoint of Artificial Intelligence},
	Year = {1969}}

@book{Lynch96,
	Address = {San Francisco, Californie, {\'E}tats-Unis},
	Author = {Nancy A. Lynch},
	Isbn = {1558603484},
	Publisher = {Morgan Kaufmann Publishers Inc.},
	Title = {Distributed Algorithms},
	Year = {1996}}

@article{Miller85,
	Author = {Webb Miller and Eugene W. Myers},
	Journal = {Software---Practice and Experience},
	Number = 11,
	Pages = {1025--1040},
	Title = {A File Comparison Program},
	Volume = 15,
	Year = 1985}

@article{myers86difference,
	Author = {Eugene W. Myers},
	Date-Modified = {2013-02-27 15:16:18 +0000},
	Journal = {Algorithmica},
	Number = 2,
	Pages = {251--266},
	Title = {An O(ND) Difference Algorithm and its Variations},
	Volume = 1,
	Year = 1986}

@inproceedings{Cobena02,
	Address = {San Jose, Californie, {\'E}tats-Unis},
	Author = {Gregory Cobena and Serge Abiteboul and Am{\'e}lie Marian},
	Booktitle = {Proceedings of the eighteenth International Conference on Data Engineering - ICDE'02},
	Ee = {http://csdl.computer.org/comp/proceedings/icde/2002/1531/00/15310041abs.htm},
	Month = february,
	Pages = {41-52},
	Publisher = {IEEE Computer Society},
	Title = {Detecting Changes in {XML} Documents},
	Year = {2002}}

@inproceedings{Salz92,
	Address = {San Antonio, Texas, {\'E}tats-Unis},
	Author = {Rich Salz},
	Booktitle = {USENIX conference proceedings},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Month = {{\'E}t{\'e}},
	Pages = {93--98},
	Publisher = {USENIX},
	Title = {{InterNetNews: Usenet} Transport for {Internet} Sites},
	Year = {1992},
	Bdsk-Url-1 = {citeseer.ist.psu.edu/salz92internetnews.html}}

@article{Fidge91,
	Address = {Los Alamitos, CA, USA},
	Author = {Colin Fidge},
	Journal = {Computer},
	Month = august,
	Number = {8},
	Pages = {28--33},
	Publisher = {IEEE Computer Society Press},
	Title = {Logical Time in Distributed Computing Systems},
	Volume = {24},
	Year = {1991}}

@inproceedings{Balasubramaniam98,
	Author = {Sundar Balasubramaniam and Benjamin C. Pierce},
	Booktitle = {Fourth Annual ACM/IEEE International Conference on Mobile Computing and Networking - MobiCom'98},
	Conf = {http://www.cis.upenn.edu/~bcpierce/papers/snc-mobicom.ps},
	Month = october,
	Slides = {http://www.cis.upenn.edu/~bcpierce/papers/snc-slides.ps},
	Title = {What is a file synchronizer?},
	Tr = {http://www.cis.upenn.edu/~bcpierce/papers/snc.ps},
	Year = 1998}

@techreport{Pierce04,
	Author = {Benjamin C. Pierce and J{\'e}r{\^o}me Vouillon},
	Institution = {Department of Computer and Information Science, University of Pennsylvania},
	Number = {MS-CIS-03-36},
	Title = {What's in {U}nison? {A} Formal Specification and Reference Implementation of a File Synchronizer},
	Tr = {http://www.cis.upenn.edu/~bcpierce/papers/unisonspec.pdf},
	Year = {2004}}

@article{Spinellis04,
	Abstract = {Distributed computer architectures labeled "peer-to-peer" are designed for the sharing of computer resources (content, storage, CPU cycles) by direct exchange, rather than requiring the intermediation or support of a centralized server or authority. Peer-to-peer architectures are characterized by their ability to adapt to failures and accommodate transient populations of nodes while maintaining acceptable connectivity and performance.Content distribution is an important peer-to-peer application on the Internet that has received considerable research attention. Content distribution applications typically allow personal computers to function in a coordinated manner as a distributed storage medium by contributing, searching, and obtaining digital content.In this survey, we propose a framework for analyzing peer-to-peer content distribution technologies. Our approach focuses on nonfunctional characteristics such as security, scalability, performance, fairness, and resource management potential, and examines the way in which these characteristics are reflected in---and affected by---the architectural design decisions adopted by current peer-to-peer systems.We study current peer-to-peer systems and infrastructure technologies in terms of their distributed object location and routing mechanisms, their approach to content replication, caching and migration, their support for encryption, access control, authentication and identity, anonymity, deniability, accountability and reputation, and their use of resource trading and management schemes.},
	Author = {Stephanos Androutsellis-Theotokis and Diomidis Spinellis},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0360-0300},
	Journal = {ACM Computing Surveys},
	Number = {4},
	Pages = {335--371},
	Publisher = {ACM Press},
	Title = {A survey of peer-to-peer content distribution technologies},
	Volume = {36},
	Year = {2004},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/1041680.1041681}}

@inproceedings{kermarrec01icecube,
	Author = {Anne-Marie Kermarrec and Antony I. T. Rowstron and Marc Shapiro and Peter Druschel},
	Booktitle = {Proceedings of the twentieth annual ACM symposium on Principles of distributed computing - PODC'01},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {1-58113-383-9},
	Location = {Newport, Rhode Island, United States},
	Pages = {210--218},
	Publisher = {ACM Press},
	Title = {The {IceCube} approach to the reconciliation of divergent replicas},
	Year = {2001},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/383962.384020}}

@inproceedings{Preguica03,
	Author = {Nuno M. Pregui\c{c}a and Marc Shapiro and Caroline Matheson},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {On The Move to Meaningful Internet Systems 2003: CoopIS, DOA, and ODBASE - OTM Confederated International Conferences, CoopIS, DOA, and ODBASE 2003},
	Ee = {http://springerlink.metapress.com/openurl.asp?genre=article{\&}issn=0302-9743{\&}volume=2888{\&}spage=38},
	Location = {Catania, Sicily, Italy},
	Month = november,
	Pages = {38-55},
	Publisher = {Springer},
	Series = {Lecture Notes in Computer Science},
	Title = {Semantics-Based Reconciliation for Collaborative and Mobile Environments},
	Volume = {2888},
	Year = {2003}}

@inproceedings{Shapiro04,
	Author = {Marc Shapiro and Nuno M. Pregui\c{c}a and James O'Brien},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {Proceedings of 5th IEEE International Conference on Mobile Data Management - MDM'04},
	Ee = {http://csdl.computer.org/comp/proceedings/mdm/2004/2070/00/20700146abs.htm},
	Location = {Berkeley, CA, USA},
	Month = january,
	Pages = {146-151},
	Publisher = {IEEE Computer Society},
	Title = {Rufis: Mobile Data Sharing Using a Generic Constraint-Oriented Reconciler},
	Year = {2004}}

@inproceedings{Petersen97,
	Author = {Karin Petersen and Mike J. Spreitzer and Douglas B. Terry and Marvin M. Theimer and Alan J. Demers},
	Booktitle = {Proceedings of the sixteenth ACM symposium on Operating systems principles - SOSP'97},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {0-89791-916-5},
	Location = {Saint Malo, France},
	Pages = {288--301},
	Publisher = {ACM Press},
	Title = {Flexible update propagation for weakly consistent replication},
	Year = {1997},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/268998.266711}}

@inproceedings{terry95bayou,
	Author = {Douglas B. Terry and Marvin M. Theimer and Karin Petersen and Alan J. Demers and Mike J. Spreitzer and Carl H. Hauser},
	Booktitle = {Proceedings of the fifteenth ACM symposium on Operating systems principles - SOSP'95},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Isbn = {0-89791-715-4},
	Keywords = {eventual consistency},
	Location = {Copper Mountain, Colorado, United States},
	Pages = {172--182},
	Publisher = {ACM Press},
	Title = {Managing update conflicts in {Bayou}, a weakly connected replicated storage system},
	Year = {1995},
	Bdsk-File-1 = { },
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/224056.224070}}

@inproceedings{Alsberg76,
	Author = {Peter A. Alsberg and John D. Day},
	Booktitle = {ICSE '76: Proceedings of the Second International Conference on Software Engineering - ICSE'76},
	Isbn = {none},
	Location = {San Francisco, California, United States},
	Pages = {562--570},
	Publisher = {IEEE Computer Society Press},
	Title = {A principle for resilient sharing of distributed resources},
	Year = {1976}}

@article{Budhiraja93,
	Author = {Navin Budhiraja and Keith Marzullo and Fred B. Schneider and Sam Toueg},
	Isbn = {0-201-62427-3},
	Journal = {Distributed systems (2nd Ed.)},
	Pages = {199--216},
	Publisher = {ACM Press/Addison-Wesley Publishing Co.},
	Title = {The primary-backup approach},
	Year = {1993}}

@article{Giles2005,
	Author = {Jim Giles},
	Biburl = {http://www.bibsonomy.org/bibtex/2c3c8afbfa50119e30a3a90af8a68a1aa/paul},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Day = {15},
	Journal = {Nature},
	Keywords = {wikipedia},
	Month = {Dec},
	Note = {10.1038/438900a},
	Number = {7070},
	Pages = {900-901},
	Title = {Internet encyclopaedias go head to head},
	Volume = {438},
	Year = {2005},
	Bdsk-Url-1 = {http://www.nature.com/nature/journal/v438/n7070/full/438900a.html}}

@article{imine03vote,
	Author = {Abdessamad Imine and Pascal Molli and G{\'e}rald Oster and Pascal Urso},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Date-Modified = {2012-01-05 10:36:56 +0100},
	Ee = {http://www.elsevier.com/gej-ng/31/29/23/135/23/show/Products/notes/index.htt\#014},
	Journal = {Electr. Notes Theor. Comput. Sci.},
	Number = {1},
	Title = {VOTE: Group Editors Analyzing Tool: System Description.},
	Volume = {86},
	Year = {2003}}

@article{TammaroJCSCW97,
	Author = {Susan G. Tammaro and Jane N. Mosier and Nancy C. Goodwin and Gabriel Spitz},
	Date-Modified = {2012-05-24 11:23:24 +0200},
	Issn = {0925-9724},
	Journal = {Computer-Supported Cooperative Work - JCSCW},
	Month = march,
	Number = {1},
	Pages = {19--51},
	Publisher = {Kluwer Academic Publishers},
	Title = {{Collaborative Writing Is Hard to Support: A Field Study of Collaborative Writing}},
	Volume = {6},
	Year = {1997},
	Bdsk-Url-1 = {http://dx.doi.org/10.1023/A:1008636321493}}

@article{noel2004empirical,
	Author = {Sylvie No\"el and Jean-Marc Robert},
	Date-Modified = {2013-07-25 09:21:58 +0000},
	Issn = {0925-9724},
	Journal = {Computer Supported Cooperative Work - JCSCW},
	Month = march,
	Number = {1},
	Pages = {63--89},
	Publisher = {Kluwer Academic Publishers},
	Title = {Empirical Study on Collaborative Writing: What Do Co-authors Do, Use, and Like?},
	Volume = {13},
	Year = {2004},
	Bdsk-Url-1 = {http://dx.doi.org/10.1023/B:COSU.0000014876.96003.be}}

@inproceedings{Garcia-Molina87,
	Author = {Hector Garcia-Molina and Kenneth Salem},
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Booktitle = {SIGMOD Conference},
	Crossref = {DBLP:conf/sigmod/87},
	Ee = {http://doi.acm.org/10.1145/38713.38742, db/conf/sigmod/Garcia-MolinaS87.html},
	Pages = {249-259},
	Title = {Sagas.},
	Year = {1987}}

@proceedings{DBLP:conf/sigmod/87,
	Bibsource = {DBLP, http://dblp.uni-trier.de},
	Editor = {Umeshwar Dayal and Irving L. Traiger},
	Publisher = {ACM Press},
	Title = {Proceedings of the Association for Computing Machinery Special Interest Group on Management of Data 1987 Annual Conference, San Francisco, California, May 27-29, 1987},
	Year = {1987}}

@article{Eugster04Epidemic,
	Acmid = {1435813},
	Address = {Los Alamitos, CA, USA},
	Author = {Eugster, Patrick T. and Guerraoui, Rachid and Kermarrec, Anne-Marie and Massoulieacute;, Laurent},
	Doi = {10.1109/MC.2004.1297243},
	Issn = {0018-9162},
	Issue_Date = {May 2004},
	Journal = {Computer},
	Month = may,
	Number = {5},
	Numpages = {8},
	Pages = {60--67},
	Publisher = {IEEE Computer Society Press},
	Title = {Epidemic Information Dissemination in Distributed Systems},
	Url = {http://dx.doi.org/10.1109/MC.2004.1297243},
	Volume = {37},
	Year = {2004},
	Bdsk-Url-1 = {http://dx.doi.org/10.1109/MC.2004.1297243}}

@article{vanRenesse96Horus,
	Acmid = {227229},
	Address = {New York, NY, USA},
	Author = {van Renesse, Robbert and Birman, Kenneth P. and Maffeis, Silvano},
	Doi = {10.1145/227210.227229},
	Issn = {0001-0782},
	Issue_Date = {April 1996},
	Journal = {Commun. ACM},
	Month = apr,
	Number = {4},
	Numpages = {8},
	Pages = {76--83},
	Publisher = {ACM},
	Title = {Horus: a flexible group communication system},
	Url = {http://doi.acm.org/10.1145/227210.227229},
	Volume = {39},
	Year = {1996},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/227210.227229},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/227210.227229}}

@inproceedings{Greif86Atomic,
	Acmid = {512659},
	Address = {New York, NY, USA},
	Author = {Greif, Irene and Seliger, Robert and Weihl, William E.},
	Booktitle = {Proceedings of the 13th ACM SIGACT-SIGPLAN symposium on Principles of programming languages},
	Doi = {10.1145/512644.512659},
	Location = {St. Petersburg Beach, Florida},
	Numpages = {13},
	Pages = {160--172},
	Publisher = {ACM},
	Series = {POPL '86},
	Title = {Atomic data abstractions in a distributed collaborative editing system},
	Url = {http://doi.acm.org/10.1145/512644.512659},
	Year = {1986},
	Bdsk-Url-1 = {http://doi.acm.org/10.1145/512644.512659},
	Bdsk-Url-2 = {http://dx.doi.org/10.1145/512644.512659}}
