merge.txt

Updating ce93cf2..63538e8
Fast-forward (no commit created; -m option ignored)
 .gitignore        | 11 +++++-----
 .gitmodules       |  2 +-
 Makefile          | 29 +++++++++++++++----------
 README.md         |  1 +
 RELNOTES.md       |  3 +++
 VERSION           |  1 +
 doc => edoc       |  0
 mix.exs           | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 rebar.config      |  3 ++-
 src/riakc.app.src |  3 +--
 tools.mk          | 37 +++++++++++++++++++-------------
 11 files changed, 119 insertions(+), 34 deletions(-)
 create mode 100644 VERSION
 rename doc => edoc (100%)
 create mode 100644 mix.exs