Merge branch 'stable'
authorDavid Thompson <davet@gnu.org>
Mon, 25 Aug 2014 19:43:14 +0000 (15:43 -0400)
committerDavid Thompson <davet@gnu.org>
Mon, 25 Aug 2014 19:43:14 +0000 (15:43 -0400)
commiteada8c38162181f8dd1f5135b651e7c6cc66edf0
treeb35d9fc6c423501ae71f56a2a93c469665d12904
parentd4f653a347b3e89757beb0f01d28ce1c6722d614
parenta4d89204c5f4d5bbb0f7c2ce3c8f88cec80cac8a
Merge branch 'stable'

Conflicts:
2014/index.html
events.php
index.php
2014/index.html