Merge branch 'master' into tags
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Sun, 23 Jan 2011 18:43:17 +0000 (19:43 +0100)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Sun, 23 Jan 2011 18:43:17 +0000 (19:43 +0100)
commitf0e000d2908aca750e1f0e2b3377876608f18aa4
tree8d966d86bb82022e40b4ff63f00931e3b63d1214
parent33d04e1f586fff9f92ea7a68a2722f1db78062c1
parentfc57ff361e2811cc5965b7a59cbaf1bd842d928e
Merge branch 'master' into tags

Conflicts:
gnumed/gnumed/client/pycommon/gmBusinessDBObject.py