Merge pull request #3471 from colemanw/master
authorcolemanw <coleman@civicrm.org>
Tue, 10 Jun 2014 19:37:48 +0000 (20:37 +0100)
committercolemanw <coleman@civicrm.org>
Tue, 10 Jun 2014 19:37:48 +0000 (20:37 +0100)
commit05d7b25a92c400d488f3b41cdda20be941a35d62
treea531765dda83b86d81c52ac3f2ed01ca413430e0
parent37bed9672e8ea689576a7dc71234371476a9d6d8
parentce8e1742bd4211e8d4bc8ead2fd5d945e8864065
Merge pull request #3471 from colemanw/master

Fix CRM-14353 and CRM-14697