Merge branch 'master' into rules_develop

Resolved conflicts in the following files: interface/patient_file/summary/demographics.php (RESOLVED) library/globals.inc.php (RESOLVED) sql/database.sql (RESOLVED)
openemr · Feb 19, 2011 · 0d73171 · 0d73171
2 parents 25fd754 + 700b619
commit 0d73171
Show file tree

Hide file tree

Showing 190 changed files with 52,862 additions and 7,161 deletions.
diff --git a/CREDITS b/CREDITS
diff --git a/ChangeLog b/ChangeLog