Merge branch '2646_filehighlight_enhancement_stable' into 4.7.5-stable
commit8ca7b0de809bb64f4ba0b86ef72ba1b65e2c4473
authorSlava Zanko <slavazanko@gmail.com>
Mon, 12 Dec 2011 09:12:59 +0000 (12 12:12 +0300)
committerSlava Zanko <slavazanko@gmail.com>
Mon, 12 Dec 2011 09:12:59 +0000 (12 12:12 +0300)
tree68b2d7563060583c67c66fce97c64fcc9b963eb1
parentaf12f743cda9bb613b2e1940be8d13f07698fc84
parent512718e8857b764f4495d60e572543d8693aa147
Merge branch '2646_filehighlight_enhancement_stable' into 4.7.5-stable

* 2646_filehighlight_enhancement_stable:
  Added file types for MS Office files
  Ticket #2646: A few useful additions to filehighlight.ini