Fixed up mergeinfo for the svn 1.5 server update. Automatic tracking of mergeinfo for the hoomd-0.8 merge to trunk should work now.
Fixed up mergeinfo for the svn 1.5 server update. Automatic tracking of mergeinfo for the hoomd-0.8 merge to trunk should work now.

git-svn-id: 4ba210d0a933e3fb1aa9ab096f190cd38965d92a@1579 fa922fa7-2fde-0310-acd8-f43f465a7996

joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue