update ChangeLog

(cherry picked from commit 9e3b64fa821794ae318c563b9d2dd4f54a91f779)

ChangeLog

@@ -49,6 +49,12 @@ Small changes:
 
 StarPU 1.3.4 (git revision xxx)
 ==============================================
+=======
+  * Move MPI cache functions into the public API
+
+StarPU 1.3.4 (git revision c37a5d024cd997596da41f765557c58099baf896)
+====================================================================
+>>>>>>> 9e3b64fa8... update ChangeLog
 
 Small features:
   * New environment variables STARPU_BUS_STATS_FILE and
@@ -77,7 +83,6 @@ Small features:
     calling hwloc-ps
 Small changes:
   * New configure option --disable-build-doc-pdf
-  * Move MPI cache functions into the public API
 
 StarPU 1.3.3 (git revision 11afc5b007fe1ab1c729b55b47a5a98ef7f3cfad)
 ====================================================================