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

Trivial merge