Merge blead into zefram/purple_signatures
authorZefram <zefram@fysh.org>
Sat, 1 Feb 2014 17:32:57 +0000 (17:32 +0000)
committerZefram <zefram@fysh.org>
Sat, 1 Feb 2014 17:32:57 +0000 (17:32 +0000)
1  2 
embed.fnc

diff --cc embed.fnc
Simple merge