Merge remote-tracking branch 'remotes/conifer/feature/tpac_hide_awards_2_7' into...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:25:01 +0000 (07:25 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:25:01 +0000 (07:25 -0500)

Trivial merge