Merge branch 'master' into rc-1-2
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Wed, 25 Apr 2012 20:15:27 +0000 (22:15 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Wed, 25 Apr 2012 20:15:27 +0000 (22:15 +0200)
commit09e35ebf60707d17dcf64d50384f6d0ffc6464f8
treed7742e9f986abbf5840306c7a3726e64e1737ee2
parente5ad7a4efd1bc8c02b71b7d9c33507cb76fd0b35
parentff556a0e2d7f9ac07a11a77b82e4311178a74dd0
Merge branch 'master' into rc-1-2

Prepare 1.2.rc2
gnumed/gnumed/client/gnumed.py
gnumed/gnumed/server/bootstrap/update_db-v16_v17.conf