From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 21 Aug 2014 14:41:10 +0000 (-0400)
Subject: Merge tag 'V1.0.20' into develop
X-Git-Tag: v1.1.30^2~11
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=32151ed1b2dfa74d8cf44d8da93ebc310ee4d109;p=web%2FKeweenaw.git

Merge tag 'V1.0.20' into develop

version 1.0.20

Conflicts:
	Toolkit/Members/css/member.css
---

32151ed1b2dfa74d8cf44d8da93ebc310ee4d109