From: Maxious <maxious@lambdacomplex.org>
Date: Wed, 25 Jan 2012 12:44:22 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=b984236b6cb618c62122c3ba936d329a4b6ff2bb
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui

Conflicts:
include/common-template.inc.php
---