Automatic snapshot commit from .. at 17ac855

Origin repo remote tracking branch: 'origin/master'
Origin repo remote repo URL: 'origin = https://github.com/jgfouca/prototype_external.git'

At commit:

17ac855 test snapshot conflict1
Author: James Foucar <jgfouca@sandia.gov>
Date: Tue Nov 4 15:48:54 2014 -0700