Merge branch 'master' of git://github.com/bpadalino/precomd
authorVaughn Cato <vaughn@vaughn2.localdomain>
Sun, 28 Jun 2009 01:37:02 +0000 (21:37 -0400)
committerVaughn Cato <vaughn@vaughn2.localdomain>
Sun, 28 Jun 2009 01:37:02 +0000 (21:37 -0400)
commitd1174dd1dd83ef3d78979ef1159e800b549807a9
treee14c5a876da573f1aefd2a71a99171c3d065c639
parent0d75d61a0bc279407d52d68dbebc36b7b5abff26
parent833b4866e818130b43d0a7728970499654efc867
Merge branch 'master' of git://github.com/bpadalino/precomd

Conflicts:
src/novacom.c