From 43ddaef92555c1f364f5bbed8b19d136a5e746fb Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Fri, 30 Nov 2012 09:55:27 +0000
Subject: Fix merge command

---
(limited to 'devbot/config.py')

--
cgit v0.9.1