tree cfda671b328ffa0231671373236b6bc05dd86cf4
parent 44eff51b406a46431cddf1c0ff82cade888cc9e9
author Matt Butcher <technosophos@gmail.com> 1407794861 -0600
committer Matt Butcher <technosophos@gmail.com> 1407794861 -0600

Experimenting with using git pull instead of git merge.