diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-25 13:04:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-25 13:04:25 -0400 |
| commit | 1657c66a84eebacd06487f7a9659ae6229ba548f (patch) | |
| tree | c5ca6bad0d3087a187db8ae3725f66903496e88d /Common | |
| parent | 0485a0b5a7b63641d352b40bdda2037377d30b15 (diff) | |
| parent | 44e9ba2471a39992d414f33509753aae7d13a7fb (diff) | |
Merge remote-tracking branch 'origin/master' into xmpp
Conflicts:
doc/design/assistant/cloud.mdwn
Diffstat (limited to 'Common')
0 files changed, 0 insertions, 0 deletions