From: declerambaul <fabian.kaelin@gmail.com>
Date: Thu, 7 Jun 2012 03:46:05 +0000 (+0200)
Subject: Resolved conflict in active_editor_count yaml file.
X-Git-Url: http://git.lttlst.com:3516/?a=commitdiff_plain;h=f5d654fdad213fa68713498c85165608c017f487;p=kraken-ui.git

Resolved conflict in active_editor_count yaml file.
---

f5d654fdad213fa68713498c85165608c017f487