Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui

Conflicts:
include/common-template.inc.php