Merge branch 'master' into smarty3upgrade
authorJonas Haraldsson <jonas227@gmail.com>
Sun, 31 Mar 2013 15:47:36 +0000 (17:47 +0200)
committerJonas Haraldsson <jonas227@gmail.com>
Sun, 31 Mar 2013 15:47:36 +0000 (17:47 +0200)
commit85e2d0a36d20d85acfec49e6a1d07bc19fa55674
treee0bb14fafbdcda93b1dfb5f00a7da0b9ff5c3ba8
parented0ef9a2ddb3ed2053f1f53c52a1091b21c76e88
parent8638201af7429324aff1a5e635776234d7db8d85
Merge branch 'master' into smarty3upgrade

Fixed Conflicts:
nixtape/templating.php