From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Dec 2011 17:27:33 +0000 (-0800)
Subject: Merge branches 'windows', 'docs' and 'forlinus' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=a8676438a72f3016daa74984def979797ded635a

Merge branches 'windows', 'docs' and 'forlinus' of git://git.hohndel.org/subsurface

* 'windows' of git://git.hohndel.org/subsurface:
  Fixes for the Windows installer

* 'docs' of git://git.hohndel.org/subsurface:
  Version 0.0.7 of user manual

* 'forlinus' of git://git.hohndel.org/subsurface:
  Remove unused return value
---

a8676438a72f3016daa74984def979797ded635a