From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 28 Jul 2011 11:19:27 +0000 (+0300)
Subject: Merge branch 'fs-master'
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=sidebyside;h=d16185720fa344263367dbd50c61bfc8183d99a4;hp=d16185720fa344263367dbd50c61bfc8183d99a4;p=libs%2Fcore.git

Merge branch 'fs-master'

Conflicts:
	.gitignore
	Build
	Changelog.txt
---