projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36e590d 5d0ae82)
Merge branch 'master' into batch-20
authorTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 20 Jan 2015 00:13:53 +0000 (16:13 -0800)

Trivial merge