Blog post about Virginia boot camp
Added reference to Duke camp on NESCent page and vice versa. Also
changed University of North Carolina title to NESCent.
Merging conflicts
Merge pull request #386 from amyrbrown/nc-camps

Added reference to Duke camp on NESCent page and vice versa.
Merge pull request #381 from gvwilson/blog-post-about-virginia-bootcamp

Blog post about Virginia boot camp
Fixing dates for UC Berkeley boot camp
Merge pull request #388 from gvwilson/fixing-date-of-ucb-bootcamp

Fixing dates for UC Berkeley boot camp
Blog post about testing image processing code
Merge pull request #389 from gvwilson/blog-post-about-testing-image-processing

Blog post about testing image processing code
Fixing a mistaken attribution in a blog post
Merge pull request #390 from gvwilson/blog-post-about-testing-image-processing

Fixing a mistaken attribution in a blog post
Blogging around cumulative enrolment
Merge pull request #391 from gvwilson/blog-cumulative-enrolment

Blogging around cumulative enrolment
cumulative-enrollment.png: UK to US spelling "enrolment" -> "enrollment"

On Mon, Mar 18, 2013 at 04:03:04AM -0700, Greg Wilson wrote:
> On 2013-03-17 10:44 PM, W. Trevor King wrote:
> > On Sun, Mar 17, 2013 at 07:18:46PM -0700, Greg Wilson wrote:
> > > A blog/2013/03/cumulative-enrolment.html (13)
> > > A files/2013/03/cumulative-enrolment.png (0)
> >
> > s/enrolment/enrollment/ for US spelling? Do we have a standardized
> > (-ised?) spelling for SWC?
>
> Canadians are allowed to use either British or American spelling. I try
> to stick to US, but this one slipped through --- go ahead and merge a fix.

There are a few other "enrolment"s in the boot camp pages, but they're
either for boot camps in the UK (where the UK spelling makes more
sense), or for the GEOMAR bootcamp in Germany (which is closer to the
UK ;), so I left them as-is.

Once we convert to Pelican, we can add UK translations explicitly, and
then everyone will be happy ;).