Merge remote-tracking branch 'origin/master' into lp1366026_active-date
authorMichele Morgan <mmorgan@noblenet.org>
Fri, 10 Oct 2014 13:59:48 +0000 (09:59 -0400)
committerMichele Morgan <mmorgan@noblenet.org>
Fri, 10 Oct 2014 13:59:48 +0000 (09:59 -0400)

Trivial merge