Merge pull request #71 from dpradeep/merge-20140930
authorKurund Jalmi <kurund@civicrm.org>
Tue, 30 Sep 2014 10:02:31 +0000 (11:02 +0100)
committerKurund Jalmi <kurund@civicrm.org>
Tue, 30 Sep 2014 10:02:31 +0000 (11:02 +0100)
merging civicrm canonical master into master


Trivial merge