Merge branch 'mc-4.6'
commit6c64add7c1321fa0ded7459cd591bd1be5e80741
authorSergei Trofimovich <slyfox@inbox.ru>
Thu, 29 Jan 2009 18:05:03 +0000 (29 20:05 +0200)
committerSergei Trofimovich <slyfox@inbox.ru>
Thu, 29 Jan 2009 18:05:03 +0000 (29 20:05 +0200)
tree3aab49e14add9cc48ccf3a852e34cce1e3a160a4
parentd5565fb6784407bdd0e5b02511440bb0eaad3b93
parenta59ccc10166d000aa26e5b50d089753e5aa4cf5d
Merge branch 'mc-4.6'

* mc-4.6:
  changelog: added entry for python syntax
  syntax: python: keywords update (patch by NNemec) fixes #216
ChangeLog