merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 11 Nov 2014 17:59:01 +0000 (17:59 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 11 Nov 2014 17:59:01 +0000 (17:59 +0000)
1  2 
.gitattributes

diff --cc .gitattributes
Simple merge