diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-25 14:43:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-25 14:43:55 -0400 |
| commit | 7e141b473f8225bc64769e57fd08722532d5ea94 (patch) | |
| tree | 9a16e7b59167d7bfd7c2886cdd7f556a4da6b7a5 /Assistant/Sync.hs | |
| parent | 8a12e78e0bff680eb913ec2140da909da74040a0 (diff) | |
| parent | 467d70fddc4e066682ceb50f3eabe9b4083c8ee3 (diff) | |
Merge branch 'master' into xmpp
Diffstat (limited to 'Assistant/Sync.hs')
0 files changed, 0 insertions, 0 deletions