Merge branch 'master' into ditto
commit89b4284cf515049b0b6b7a4ace65f8f58ac3954e
authorStephen Lombardo <sjlombardo@zetetic.net>
Thu, 22 Jul 2010 13:44:53 +0000 (22 09:44 -0400)
committerStephen Lombardo <sjlombardo@zetetic.net>
Thu, 22 Jul 2010 13:44:53 +0000 (22 09:44 -0400)
tree1bfdee56406b931f74ca8e8c289763a0af0061d0
parent7c6ac4010ef5819c6ff14c9f648967581dc2e39a
parent29b781102ae63dd5e6c81017e6b0208aa2316436
Merge branch 'master' into ditto
src/func.c