espressomd/espresso — pull request #119 by ohickey (2013-10-21 18:27:50+00:00)
Title: Fixed pull request

I talked to Stefan who helped me fix the problem. There are now no reverts, apologies again for the sloppiness.