Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Mon, 20 Sep 2010 11:52:21 +0000 (13:52 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Mon, 20 Sep 2010 11:52:21 +0000 (13:52 +0200)
1  2 
share/template/Makefile.am
src/mdlib/ns.c

Simple merge
diff --cc src/mdlib/ns.c
Simple merge