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)

Trivial merge