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)
commit22b5231d5ed4721f5aa9e354ca4a809b32cdd482
tree51c985b831e7b77b1a9a99579f088f8570309a8b
parent1ddf0d3ed051c6c35f4f4b5abb069fcd68942b60
parent5ac3bb86beb20c72825da35d6b5c90dc1baebfcb
Merge branch release-5-1

Change-Id: I442e3600d7f9f49df2021d99b440b64e13a0fc9a
docs/manual/algorithms.tex