Merge branch 'impro/switch-xattr-header'
commitc7e8ae67a35a6b578f9a756a59256d8c8933a046
authorPrzemyslaw Pawelczyk <przemoc@gmail.com>
Wed, 2 Sep 2015 21:32:01 +0000 (2 23:32 +0200)
committerPrzemyslaw Pawelczyk <przemoc@gmail.com>
Wed, 2 Sep 2015 21:32:01 +0000 (2 23:32 +0200)
treead836113c7fa6e770b753a066a81b67fd2f6cbff
parent76760ad49ac9efdf3980cae2e816f899986f5eeb
parent3c3d9053ea088b160ac7c36c27960da254fba976
Merge branch 'impro/switch-xattr-header'

Conflicts:
NEWS
NEWS
metastore.c