From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Thu, 26 May 2011 09:58:57 +0000 (+0200)
Subject: Merge branch 'file-magic'
X-Git-Tag: v2.6~62
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=2c540cf43202da171603e54939458766280e3955;p=libi2ncommon

Merge branch 'file-magic'
---

2c540cf43202da171603e54939458766280e3955