Merge branch 'feature/icalFeedCron' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Aug 2016 18:59:45 +0000 (14:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Aug 2016 18:59:45 +0000 (14:59 -0400)

Trivial merge