From 8ef30d00eb96004c39540019336c0ec99dae01cb Mon Sep 17 00:00:00 2001
From: Clipperz <info@clipperz.com>
Date: Wed, 09 Jan 2013 11:28:56 +0000
Subject: Fixed conflict

---
(limited to 'scripts')

--
cgit v0.9.0.2