Merge pull request #67 from dpradeep/merge-20140827
authorKurund Jalmi <kurund@civicrm.org>
Wed, 27 Aug 2014 13:54:20 +0000 (19:24 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 27 Aug 2014 13:54:20 +0000 (19:24 +0530)
commit078529462ae18d40a30674a95454e0a8b81ba6f0
treecf1e171aacfbfa691697758c5f6904fcefd3dca6
parent9e310c3a0a1b7f1e4e8083985abf07683d63486f
parent468dd6c07d78b8a2c0a95187793c26326a7293b4
Merge pull request #67 from dpradeep/merge-20140827

merging civicrm canonical master into master