[nginx/f19: 2/2] Merge branch 'f20' into f19

[Jamie Nguyen]

commit e09c57ecbb2ca0e58c57d36201730ba0c5efd6ab
Merge: 5586f9b c9246bf
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:27:56 2014 +0100

    Merge branch 'f20' into f19

 vim-ftdetect.vim |    4 +
 vim-indent.vim   |   11 +
 vim-syntax.vim   |  703 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 718 insertions(+), 0 deletions(-)
---