Merge pull request #1389 from kurund/merge-fixes
authorKurund Jalmi <kurund@civicrm.org>
Sun, 11 Aug 2013 18:34:34 +0000 (11:34 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Sun, 11 Aug 2013 18:34:34 +0000 (11:34 -0700)
commit8450a67c9cacb720ee5bf9dcafe64f813824f38c
tree3c0df37672db596e3b2b2573451d0aac4fc6484b
parenta6ebd0ca7defbfa2e1a8fd70c53e040ad63b6967
parent5ccc09d85bf825ae692e149b18477ca7e07eb4c5
Merge pull request #1389 from kurund/merge-fixes

test fixes