From: Ian Beckwith <ianb@erislabs.net>
Date: Sun, 10 Jul 2011 19:47:02 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: 301-1~6
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=c32f54d58f54c8c69564a4f6fe3c67fdbfc60233

Merge branch 'upstream'
ckdaily snapshot from 20110706
snapshot ships with ckc299.txt instead of ckc300, removed.
---

c32f54d58f54c8c69564a4f6fe3c67fdbfc60233