Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 28 Jan 2016 22:51:41 +0000 (23:51 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 28 Jan 2016 22:52:41 +0000 (23:52 +0100)
Change-Id: I442e3600d7f9f49df2021d99b440b64e13a0fc9a

1  2 
docs/manual/algorithms.tex

Simple merge