diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-24 15:58:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-24 15:58:48 -0400 |
| commit | 003d045f1997eea48f4f962e5908359b6a2ac7dc (patch) | |
| tree | 6ad0d0dd22227f086fe6d0e6edd09bcd3449b8a0 /Assistant | |
| parent | e61eabc176e145deed2572efff3e1c22c0939b79 (diff) | |
| parent | e6631f91826ad79de70b629e8343a7b8c1e1fa13 (diff) | |
Merge branch 'master' into xmpp
Diffstat (limited to 'Assistant')
0 files changed, 0 insertions, 0 deletions