Merge branch 'feature/ical' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 15:36:05 +0000 (11:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 15:36:05 +0000 (11:36 -0400)

Trivial merge