Merge branch 'vendor/LIBEDIT'
authorJohn Marino <draco@marino.st>
Thu, 10 May 2012 21:36:29 +0000 (23:36 +0200)
committerJohn Marino <draco@marino.st>
Thu, 10 May 2012 21:36:29 +0000 (23:36 +0200)
commit588d6d628f181a186c00b5be73b04612e5a9427e
tree3bcc8c7cf0c97c778e76e6fb9f274a74f7bb3d3c
parentb911de4f74914339980815f8ab0aa737d31cb752
parent32fe07f89d87adfc65eebe9f2812a999af20d10f
Merge branch 'vendor/LIBEDIT'