From c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 04 Jul 2013 08:19:00 -0400
Subject: [PATCH] Fix conflicts in last commit

---
 0 files changed, 0 insertions(+), 0 deletions(-)


--
Gitblit v1.9.1