Merge branch 'maint-1.5.4' into maint
[git] / templates / branches--
1 : this is just to ensure the directory exists.