Merge branch 'js/notes'

* js/notes:
  git-notes: fix printing of multi-line notes
  notes: fix core.notesRef documentation
  Add an expensive test for git-notes
  Speed up git notes lookup
  Add a script to edit/inspect notes
  Introduce commit notes

Conflicts:
	pretty.c

diff --cc .gitignore
Simple merge

diff --cc Documentation/config.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge

diff --cc commit.c
Simple merge

diff --cc pretty.c
index cc460b56970c3869e67feb816f76f4804e37e7ce,2d2872f3b5707c63c056c7591948db261a13b011..8d4dbc9fbbcffb73e8669ac08a1292ad2a0f0919
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -6,7 -6,7 +6,8 @@@
  #include "string-list.h"
  #include "mailmap.h"
  #include "log-tree.h"
+ #include "notes.h"
 +#include "color.h"
  
  static char *user_format;