Merge pull request #6249 from eileenmcnaughton/CRM-16850-master
authorDave Greenberg <dave@civicrm.org>
Tue, 21 Jul 2015 21:20:14 +0000 (14:20 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 21 Jul 2015 21:20:14 +0000 (14:20 -0700)
commitd45be25c3e5d9f39d14ba8cd3c74eb5ecb934c46
tree3fc91b7085ac2ea523109541411f78ca761f7822
parentecbbc0f5428e09a8668da0fe3343d8cf0dc6fb17
parent90102a325bfd3a8436a74ac426a2f06f979fa04d
Merge pull request #6249 from eileenmcnaughton/CRM-16850-master

CRM-16850 master