From: Tim Otten <totten@civicrm.org>
Date: Mon, 19 Jan 2015 06:53:05 +0000 (-0800)
Subject: Merge pull request #4973 from PalanteJon/cleanup-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5cca31a2c7a29e6ad9220d2bd197f4a679d2b6e2;p=civicrm-core.git

Merge pull request #4973 from PalanteJon/cleanup-master

INFRA-132 batch 2 cleanup
---

5cca31a2c7a29e6ad9220d2bd197f4a679d2b6e2