8ac4d6a92adb6875dd18131263b66e8e60713638 37e913f755a5b30dae68accbe252612aac7998ec Tobias Lütke tobi@jadedpixel.com http://github.com/tobi/liquid/commit/a65bd76e726c3a4b50a25df8289a77c3945d0b78 a65bd76e726c3a4b50a25df8289a77c3945d0b78 2009-06-15T06:00:30-07:00 2009-06-15T06:00:30-07:00 Merge branch 'master' of git@github.com:tobi/liquid Conflicts: lib/liquid.rb lib/liquid/context.rb lib/liquid/variable.rb test/standard_tag_test.rb 75ce2003fb73ee26727b4eea3d0898d06b2706d5 Tobias Lütke tobi@jadedpixel.com