Merge pull request #14 from dlobo/CRM-12005
authorTim Otten <to-git@think.hm>
Mon, 4 Mar 2013 21:56:45 +0000 (13:56 -0800)
committerTim Otten <to-git@think.hm>
Mon, 4 Mar 2013 21:56:45 +0000 (13:56 -0800)
commitcf2b13d63ecad545f0275b215d77a6417f1903c0
treeec5e22a351a2f0d5f591b299318192b33f919f6b
parentf7d82456e09042a3c8ca7d2ffc24be1ea05fdb12
parent7b284d16e80364549b4ce7628bc68685943acd6c
Merge pull request #14 from dlobo/CRM-12005

Fix for CRM-12005 and CRM-12004