projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 99466cf 1b642ea)
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12
authorTim Otten <totten@civicrm.org>
Tue, 24 Jun 2014 01:41:37 +0000 (18:41 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 24 Jun 2014 01:41:37 +0000 (18:41 -0700)
commit61101c0139a33917f1220f3e970b7c1293f34449
treee670b6646bc9515d5085e9d9ad05df20fbe186adtree | snapshot (zip tar.gz)
parent99466cf10661829757a8aed820d041b10811c059commit | diff
parent1b642ea42e31c6d3be4a73dbbec1aa220225354ccommit | diff
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-18-25-12

Conflicts:
distmaker/dists/drupal6_php5.sh
distmaker/dists/drupal_php5.sh
distmaker/dists/drupal_sk_php5.sh
distmaker/dists/joomla_php5.sh
distmaker/dists/l10n.sh
distmaker/dists/wordpress_php5.sh
xml/schema/Core/MappingField.xml
distmaker/dists/common.sh | diff2 | blob | history