Merge pull request #1307 from eileenmcnaughton/CRM-12108
authorTim Otten <to-git@think.hm>
Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)
committerTim Otten <to-git@think.hm>
Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)
commit0d9207e53947786187b322e9cfdcdd80736ec39c
treed05056952dbffa2160e5243dda01556fd102312d
parentafabbd8f4ca3659b2e6efe40dac05afe82a3e66f
parent2b7d3f8a2d7b28cba83264fad75d1ace65a45735
Merge pull request #1307 from eileenmcnaughton/CRM-12108

 CRM-12108 fix bug introduced when rebasing PR