Merge pull request #1711 from colemanw/master
authorDave Greenberg <dave@civicrm.org>
Mon, 30 Sep 2013 16:46:25 +0000 (09:46 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 30 Sep 2013 16:46:25 +0000 (09:46 -0700)
commitae06920df9e53c0700b99609851d6d8a78a291bd
tree1bb7d8f0578d3d27578e9c3d29ad3ec25e21927a
parenta694874199cbef06b6421a647b3ee3d4e21e72e9
parentcc6153737212ad8fbe40ffb64d3401bb11e67664
Merge pull request #1711 from colemanw/master

CRM-13161 change token names back to the familiar old ones