From: Mark Pemberton <mpemberton5@gmail.com>
Date: Tue, 17 May 2011 04:27:48 +0000 (-0400)
Subject: fixed merge issue
X-Git-Tag: v0.98.0~40
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1c6ff8cea61502a39887885847b4c320eee5c46b;p=semanticscuttle.git

fixed merge issue
---

1c6ff8cea61502a39887885847b4c320eee5c46b