Merge branch 'master' into cj-mc1
authorCullen Jennings <fluffy@iii.ca>
Tue, 28 May 2013 20:37:24 +0000 (14:37 -0600)
committerCullen Jennings <fluffy@iii.ca>
Tue, 28 May 2013 20:37:24 +0000 (14:37 -0600)
1  2 
src/encode.c

diff --cc src/encode.c
Simple merge