Merge remote-tracking branch 'alexis/libs/json' into next
[nit.git] / .gitattributes
2013-05-16 Jean Privat.gitattribute: do not diff c_src and parser generated...