tree b5372e762662882baa8daced4e79407b9c8930e0
parent cf86dbdba144c2710377ca50ccb4ed795221e74e
parent 9d4776aff854086916e30b0296e0956455320b23
author Scott Baker <smbaker@gmail.com> 1462376605 -0700
committer Scott Baker <smbaker@gmail.com> 1462376605 -0700

Merge branch 'feature/api-cleanup'