Merge remote-tracking branch 'origin/master'
authorjsnyder83 <jsnyder83@gmail.com>
Mon, 29 Dec 2014 13:31:03 +0000 (20:31 +0700)
committerjsnyder83 <jsnyder83@gmail.com>
Mon, 29 Dec 2014 13:31:03 +0000 (20:31 +0700)
commit1a685cdf3a4b446a220946da0aae63db16afcd35
treeaa33272c1e428ea34baa9aa0bbf4fca13bd2b029
parent0c4599bb0b65e69747ad6fbc4257e3811c379d90
parent3aa5563bcdfdd425898126833f9ab12189c449a9
Merge remote-tracking branch 'origin/master'

Conflicts:
xml/templates/civicrm_state_province.tpl
xml/templates/civicrm_state_province.tpl