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)
commit0155e0444fe49b7100919b19754b0c785a73855c
tree9b3384de7c2b11621e33099e38502ad33bfa7e0f
parent30d9c59b5f3cba8b5d632d20c2370e82d8ba69ca
parentb33b7abd0ef74e9aff9fd7775585be1d2e690942
Merge blead into zefram/purple_signatures
embed.fnc