Merge pull request #4927 from totten/master-setupsh-data
authorTim Otten <totten@civicrm.org>
Wed, 14 Jan 2015 00:28:17 +0000 (16:28 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 14 Jan 2015 00:28:17 +0000 (16:28 -0800)
commite48968e15c9e15dd9f458605ea1e08407738ec82
tree5c0e4aeff3fc74b64159d5becdecce554b61960a
parentbe0f31c3e91702a5ab6eb5fa7cb81eafee3202f2
parente16fa8d0dbe0d763272257a67f41f10839ac7973
Merge pull request #4927 from totten/master-setupsh-data

bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options