D:\Projects\openMRS\openmrs-core>git pull upstream master
remote: Counting objects: 161, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 104 (delta 45), reused 87 (delta 32)
Receiving objects: 100% (104/104), 11.36 KiB, done.
Resolving deltas: 100% (45/45), completed with 22 local objects.
From https://github.com/openmrs/openmrs-core
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 .../main/java/org/openmrs/BaseOpenmrsObject.java   | 28 +++++---------
 .../main/java/org/openmrs/api/context/Context.java |  6 ++-
 .../openmrs/api/db/hibernate/HibernateUserDAO.java | 27 +++++--------
 .../org/openmrs/api/impl/DatatypeServiceImpl.java  |  5 +++
 .../java/org/openmrs/api/impl/UserServiceImpl.java |  1 +
 .../impl/MessageSourceServiceImpl.java             |  1 +
 .../org/openmrs/validator/DrugOrderValidator.java  | 12 +++++-
 .../main/resources/liquibase-update-to-latest.xml  |  7 ++--
 .../java/org/openmrs/BaseOpenmrsObjectTest.java    | 45 ++++++++++++++--------
 .../java/org/openmrs/module/ModuleUtilTest.java    |  1 -
 .../openmrs/validator/DrugOrderValidatorTest.java  | 32 +++++++++++++++
 .../java/org/openmrs/module/web/WebModuleUtil.java |  2 +-
 .../controller/patient/PatientFormController.java  | 36 ++++-------------
 .../web/controller/visit/VisitFormController.java  | 26 +++++++++----
 web/src/main/resources/openmrs-servlet.xml         |  1 -
 webapp/src/main/webapp/WEB-INF/messages.properties |  6 ++-
 .../src/main/webapp/WEB-INF/messages_es.properties | 10 ++++-
 .../src/main/webapp/WEB-INF/tags/locationField.tag |  2 +-
 18 files changed, 148 insertions(+), 100 deletions(-)

D:\Projects\openMRS\openmrs-core>