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)
commit2ce224f7b35f8b3b1c135942e4076226f25c4cd9
treed89d672dd01835267f7647cb26210e3e6b88d96a
parentc2646f7bfe5af5ce21fce5959ab96dadc24004c6
parentfdf69c9e690407ef1c614c6989607c25c8ffafef
Merge remote-tracking branch 'remotes/conifer/feature/patron_privacy_2_7' into mergery_2_7