diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-21 15:54:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-21 15:54:47 -0400 |
| commit | 14f2a42ca4131a7a51a9e10a94521639b971bccd (patch) | |
| tree | a76c877c097d190e823868163bb269c7a2afbc9e /Git/Ref.hs | |
| parent | 445405a81a435e9f06b7f8fcd74339d853585a20 (diff) | |
| parent | 27a5b84da481fdf2bc87fc9a9fc7e1080a5a9b09 (diff) | |
Merge branch 'master' into xmpp
Conflicts:
debian/changelog
doc/design/assistant/more_cloud_providers.mdwn
Diffstat (limited to 'Git/Ref.hs')
0 files changed, 0 insertions, 0 deletions