Merge remote-tracking branch 'rob/CRM-16367-46' into CRM-16367
authorkurund <kurund@civicrm.org>
Sun, 10 May 2015 10:37:03 +0000 (06:37 -0400)
committerkurund <kurund@civicrm.org>
Sun, 10 May 2015 10:37:03 +0000 (06:37 -0400)
commit56f426d9b647e8b99d465167e1911caeda5e14b4
tree23a58a443bfc753d3ba8f4acb8074c1b22f2006c
parenteaeff80064a8745d3a5e5c865a3e732832bad44d
parentb310af84dcb953787fc99719d12fc0c9a9a1b9b5
Merge remote-tracking branch 'rob/CRM-16367-46' into CRM-16367

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl
sql/civicrm_generated.mysql
CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl
sql/civicrm_generated.mysql