Update notes for submitted changes

* Fix a number of failing conflict situations

1a/9f12277313c12830b24b63559bb31eb584b241

@@ -0,0 +1,7 @@
+Code-Review+2: Robin Rosenberg <robin.rosenberg@dewire.com>
+Verified+1: Hudson CI
+Submitted-by: Robin Rosenberg <robin.rosenberg@dewire.com>
+Submitted-at: Sat, 17 May 2014 13:28:20 -0400
+Reviewed-on: https://git.eclipse.org/r/22160
+Project: jgit/jgit
+Branch: refs/heads/master