3349: Merge branch 'master' into 3349-install-docs
authorTom Clegg <tom@curoverse.com>
Wed, 30 Jul 2014 19:56:46 +0000 (15:56 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 30 Jul 2014 19:56:46 +0000 (15:56 -0400)
commitb3eb8176f8d060b0e4652cae8e041c6bf2b7103e
treebc4bb54a324bb233dedc0c8b8b44b9749228601a
parent062a8bf0f9a1fe762c16749e7d0bcea77d1fbd73
parent20f944be863d7d455534ebac0083c25869a3379d
3349: Merge branch 'master' into 3349-install-docs