From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 23:57:08 +0000 (-0800)
Subject: Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=cb2114f263d7b23b8b2471cdf2037a0877eec50d

Merge branch 'mac-fixes' of git://git.hohndel.org/subsurface

* 'mac-fixes' of git://git.hohndel.org/subsurface:
  Preference handling on Mac
---

cb2114f263d7b23b8b2471cdf2037a0877eec50d