]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorAnton Khodakivskiy <akhodakivskiy@gmail.com>
Fri, 19 Jul 2013 20:46:18 +0000 (23:46 +0300)
committerAnton Khodakivskiy <akhodakivskiy@gmail.com>
Fri, 19 Jul 2013 20:46:18 +0000 (23:46 +0300)
commite0611ee8f181658a35f5354b66dfa56bb60983b5
tree683b376406d319ab71f7f206c4957edf23f82718
parentda612c74245d05e089490d5291a05a95ebead90a
parent75e98ac4ed4c5734d4b03bc19e959f001a86814c
Merge branch 'master' into develop

Conflicts:
README.md
extension/chrome.manifest
extension/install.rdf
README.md
extension/chrome.manifest
extension/install.rdf
Imprint / Impressum