Merge pull request #39 from daisieh/bug3331
commitda5e4adcfe44d4295ed2d0a71ec5ecf9b88e5a0c
authorChris Fields <cjfields@illinois.edu>
Fri, 24 Aug 2012 21:54:13 +0000 (24 14:54 -0700)
committerChris Fields <cjfields@illinois.edu>
Fri, 24 Aug 2012 21:54:13 +0000 (24 14:54 -0700)
treeb535d29aeb0f0e25b4e0e078750f3828df18fb9a
parenta5d46460e0bbe328d7ab3c0e721bb132c766acc5
parentfce6f7b2a6fb5fa1dbb94dcf99f692062f0992ca
Merge pull request #39 from daisieh/bug3331

Merging in @daisieh commits