From 35a8e898324849dbb8e33d139599e846d307f290 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Fri, 01 Mar 2013 00:14:38 +0000
Subject: maybe all the git merge problems are finally resolved?

---
(limited to 'plugins')

--
cgit v0.9.1