Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01
authorTim Otten <totten@civicrm.org>
Thu, 5 Dec 2013 00:27:04 +0000 (16:27 -0800)
committerTim Otten <totten@civicrm.org>
Thu, 5 Dec 2013 00:27:04 +0000 (16:27 -0800)
commit052f7a991381723f4bb19412a513ac30ff1f34ad
tree7bbf364e2dc8adcfb6339a257afa08de18def270
parentb92e49f5c0265732f9b98125672c10c57b6e271f
parent25c6420a963cd3be7861aeba9996808d87e569a3
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-16-27-01