Merge branch 'master' into output
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 25 Dec 2009 09:51:01 +0000 (10:51 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 25 Dec 2009 09:51:01 +0000 (10:51 +0100)
commit8b71948cd57dbd2787cb4c50525b957e9be8a62b
tree36b05046aa0c1232482fc48f6c6b76edf6aa5c76
parent7c08a6e1009cf60847e770a77a73c650e9326379
parent1085f5128713881e135ea83fbdf411b99e8f32b6
Merge branch 'master' into output

Conflicts:

configure.ac
configure.ac
src/language/stats/factor.c