diff options
author | PaulePanter <PaulePanter@web> | 2010-04-14 17:38:39 +0000 |
---|---|---|
committer | Joey Hess <joey@finch.kitenet.net> | 2010-04-14 17:38:39 +0000 |
commit | 53c8e674ace50d8733e913e8cfa5d40793e5019d (patch) | |
tree | a211031f8c3a02cc9bfe279a3d3cdff95a540a6c /doc/smileys | |
parent | e6e77d2311503627fb9ac8485f323535de059359 (diff) |
Correct comment. We want to merge the branch *doc* into branch *master* as the sample output suggests.
Diffstat (limited to 'doc/smileys')
0 files changed, 0 insertions, 0 deletions