Merge branch 'working'
authorJim <jim.pryor@nyu.edu>
Thu, 30 Apr 2015 16:39:43 +0000 (12:39 -0400)
committerJim <jim.pryor@nyu.edu>
Thu, 30 Apr 2015 16:39:43 +0000 (12:39 -0400)
commit12ccd528a72f885a6bf8b6f6ce183dd281150844
treea6bd950b143ebea4b4df8053a4e498063ae4e70e
parenteca9db4db15dbfd6c6f41db7759fefc4fd05174f
parentfac1570c5e308143c929a1a0c686d4a45ccaae61
Merge branch 'working'

* working:
  add cps_hint_*