Merge branch 'release-4-5-patches'
commit3e663f61d0dbdc311dbe5d6f63da6e6aa11ee33c
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Mon, 30 Aug 2010 18:33:02 +0000 (30 20:33 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Mon, 30 Aug 2010 18:33:02 +0000 (30 20:33 +0200)
tree1506c88c0f80fa4517a9dae7c6bf876cdf2219d0
parent0e6bde6b0301caf935f9a8c60e86412330cf64e3
parent6d7228c0dff948566d7028917e852b01cc43a109
Merge branch 'release-4-5-patches'
share/template/Makefile.am