Merge branch 'master' into rc-1-0
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Tue, 4 Oct 2011 13:55:38 +0000 (15:55 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Tue, 4 Oct 2011 13:55:38 +0000 (15:55 +0200)
commita25d4de29491d2019e70fc74aa931892727903b7
tree6e39b0a3e7a89cf71ccb0db71d5bfbe457133de0
parent07a9136f4e3f406b590b6020a1ff2f02b89a81dc
parentb4fcdd406467eabf99000b3cea2f2096772735df
Merge branch 'master' into rc-1-0
gnumed/gnumed/server/bootstrap/update_db-v15_v16.conf