Merge branch 'master' into rc-1-0 rel-1-0-rc4
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Fri, 23 Sep 2011 10:51:26 +0000 (12:51 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Fri, 23 Sep 2011 10:51:26 +0000 (12:51 +0200)
commit07a9136f4e3f406b590b6020a1ff2f02b89a81dc
treea404c01d1ea0529700578fb120eb4c561f7671c1
parent0d9e7cf4c7cd047460b48b7dd5940662eee4fc3c
parentd60c8c5ec36e9a016b53f854948443edb2e1ad40
Merge branch 'master' into rc-1-0
gnumed/gnumed/server/bootstrap/update_db-v15_v16.conf