Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 97854f154aa02a90f6f497688d5aba91253ffc91 https://github.com/hibernate/hibernate-orm/commit/97854f154aa02a90f6f4976... Author: Christian Beikov <christian.beikov(a)gmail.com&gt; Date: 2013-09-11 (Wed, 11 Sep 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java Log Message: ----------- HHH-8491 Improved implementation for locale string parsing Conflicts: hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java Commit: 82aef14e0706c2a44065c8426c259eb02e7f7434 https://github.com/hibernate/hibernate-orm/commit/82aef14e0706c2a44065c84... Author: Brett Meyer <brett(a)3riverdev.com&gt; Date: 2013-09-11 (Wed, 11 Sep 2013) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleTypeDescriptor.java M hibernate-core/src/test/java/org/hibernate/test/type/descriptor/java/LocaleTypeDescriptorTest.java Log Message: ----------- HHH-8491 formatting and improved readability Compare: https://github.com/hibernate/hibernate-orm/compare/795886245dd6...82aef14...