From: colemanw <coleman@civicrm.org>
Date: Wed, 8 Jan 2014 06:20:52 +0000 (-0800)
Subject: Merge pull request #2308 from civicrm/4.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=730507f70920a6ae9077976fd501e5ccac2fb4b7;p=civicrm-core.git

Merge pull request #2308 from civicrm/4.4

Merge branch 4.4 into master
---

730507f70920a6ae9077976fd501e5ccac2fb4b7