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)
commitcd63800b16f4379c7915a15698a55da14fe3a0f6
tree74d417477146c78a5f31c3892e58953b518a9504
parentb44e8184c938c41578cc1198ac37f6d19cb2b68f
parent8ee49799ae6e12a358af8de58bfe95785631b476
merge from trunk
.gitattributes