Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Fri, 21 Sep 2012 17:27:27 +0000 (10:27 -0700)
committerBrian Norris <banorris@uci.edu>
Fri, 21 Sep 2012 17:27:27 +0000 (10:27 -0700)
commitc7cd65f78d1c7956a02ac1e1cbd833e3dd17a3f1
tree638ba329eff784af278df2e7bb66d6266a28070f
parentdaebea56175a01c918b69836581f9384bd966f78
parente2b556e7bb8b156ff1fe75e5d4c254bb3fc240c6
Merge branch 'norris'

1 bugfix