Merge branch 'presentation-slides'
authorNeil Smith <neil.git@njae.me.uk>
Wed, 12 Mar 2014 12:47:28 +0000 (12:47 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Wed, 12 Mar 2014 12:47:28 +0000 (12:47 +0000)

Trivial merge