]> git.donarmstrong.com Git - debian-ctte.git/commit
Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debian-ctte
authorDon Armstrong <don@donarmstrong.com>
Tue, 17 Dec 2013 22:57:32 +0000 (14:57 -0800)
committerDon Armstrong <don@donarmstrong.com>
Tue, 17 Dec 2013 22:57:32 +0000 (14:57 -0800)
commit07afaad74834d1e67c23c829e7800993db042d11
treeb035773781ebc62fce24764a80dd6a71f10398b0
parent1d0fe8d9324de62bd185e9d9c16344dd777283d5
parent233be1a3acfb4e765c3312053bd705429c200c9a
Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debian-ctte

Conflicts:
meetings.ics