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)
commiteeca7dcddc61fa54bb380ca229dfb7e059a77907
treee0bb14fafbdcda93b1dfb5f00a7da0b9ff5c3ba8
parent2841205c1d3dee35f6be05e7c579a7a137d79a3f
parenta660add8c23bc171b5f4da6b56ac3e1e99cda212
Merge branch 'master' into smarty3upgrade

Fixed Conflicts:
nixtape/templating.php