diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-24 12:54:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-24 12:54:14 -0400 |
| commit | 96c83b2a830ffb93384652779456b6895b080192 (patch) | |
| tree | a585933d7a648ce18e7e003ba838d5c80c4839ee /NEWS | |
| parent | 0db413d7771b4840a007cad56348f89fe1b80644 (diff) | |
| parent | 69fe824d049ae60c73b65fcaf7fc4bbbe5d320c1 (diff) | |
Merge branch 'master' into xmpp
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions