| commit | 348dfc4906337a56144515d3260f9f57bd436b10 | |
| author | Pete Phillips <pete@smtl.co.uk> | |
| Wed, 13 Jan 2010 11:51:59 +0000 (13 11:51 +0000) | ||
| committer | Pete Phillips <pete@smtl.co.uk> | |
| Wed, 13 Jan 2010 11:51:59 +0000 (13 11:51 +0000) | ||
| tree | 8d3379da34a35fac55b3f66683a16733ad5a45ad | treesnapshot (tar.gz zip) |
| parent | 16c256253e5a64fb76858f1b28bf35f481fbee7c | commitdiff |
| parent | 06a7212c476f96e74da2f847d58d5f82064fdb3b | commitdiff |
Merge branch 'master' of git+ssh://PianoPete@repo.or.cz/srv/git/Worg
Conflicts:
org-people.org
trying to get my entry sorted :-)
Conflicts:
org-people.org
trying to get my entry sorted :-)
| org-people.org | diff1 | diff2 | blobhistory |