Merge pull request #3177 from colemanw/cleanup
authorcolemanw <coleman@civicrm.org>
Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)
committercolemanw <coleman@civicrm.org>
Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)
commit92acaa1fb69320167d4be85b303b7ff06529d842
tree2225ceb695eba6d8484937c1b9bfc83e80d15b20
parent4a65765017332a22f2164d10485972ce659c5871
parent7dcb9f55e6f180c417f9d9fa201efd42aa6dd82f
Merge pull request #3177 from colemanw/cleanup

Various fixes and cleanup