Merge branch stable-1.14
* stable-1.14:
gwtorm 1.14
Change-Id: I70052e116b77c02f70d2994c3157d704279e0176
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..154b9bb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Adrian Görler <adrian.goerler@sap.com> Adrian Goerler <adrian.goerler@sap.com>
+Edwin Kempin <edwin.kempin@sap.com> Edwin Kempin <edwin.kempin@gmail.com>
+Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <sasa.zivkov@sap.com>
+Saša Živkov <sasa.zivkov@sap.com> Saša Živkov <zivkov@gmail.com>
+Shawn Pearce <sop@google.com> Shawn O. Pearce <sop@google.com>
diff --git a/pom.xml b/pom.xml
index 47e51a4..b1a8b51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>com.google.gerrit</groupId>
<artifactId>gwtorm</artifactId>
<packaging>jar</packaging>
- <version>1.14</version>
+ <version>1.15-SNAPSHOT</version>
<name>gwtorm</name>
<description>Tiny ORM</description>
<url>https://gerrit.googlesource.com/gwtorm</url>
