Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 19:47:02 +0000 (20:47 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 19:47:02 +0000 (20:47 +0100)
commitc32f54d58f54c8c69564a4f6fe3c67fdbfc60233
tree569cb4103e1d9d7955580fdae25d7df3270704de
parent5dcfe8c9e4b5909c8b37aa974801ed818777892a
parent271d5ce46cc30e7e2a108b795589c1a4949bf02b
Merge branch 'upstream'
ckdaily snapshot from 20110706
snapshot ships with ckc299.txt instead of ckc300, removed.