Merge branch 'file-magic'
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 26 May 2011 09:58:57 +0000 (11:58 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 26 May 2011 09:58:57 +0000 (11:58 +0200)
commit2c540cf43202da171603e54939458766280e3955
treeaa11a4cd02edd3ab71158e7db63f734b03a8f736
parentfad32e5f059bba661c9ba3eb72c0345f2858c2b1
parentec731ac88ea0b433a25157d9b5189cdac99f1767
Merge branch 'file-magic'