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