Merge remote-tracking branch 'origin/master' into CRM-13640
authorChris Burgess <chris@giantrobot.co.nz>
Tue, 23 Aug 2016 21:29:00 +0000 (09:29 +1200)
committerChris Burgess <chris@giantrobot.co.nz>
Tue, 23 Aug 2016 21:29:00 +0000 (09:29 +1200)
1  2 
CRM/Core/Error.php

Simple merge