From: Don Armstrong Date: Tue, 17 Dec 2013 22:57:32 +0000 (-0800) Subject: Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debian-ctte X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=07afaad74834d1e67c23c829e7800993db042d11;p=debian-ctte.git Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/debian-ctte Conflicts: meetings.ics --- 07afaad74834d1e67c23c829e7800993db042d11