Merge commit 'cdcba5b2f6270de808e51b3b933374170611b91d'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:37:18 +0000 (14:37 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:37:18 +0000 (14:37 +0100)
commit6f248df1f67cfc18b210a431d540077f9f4b8da2
tree303b13c9f23b51047b3d6e070a10f63f9f16bb25
parent2f5c5d09a069b3e967bef815e041d1bab854a2e5
parentcdcba5b2f6270de808e51b3b933374170611b91d
Merge commit 'cdcba5b2f6270de808e51b3b933374170611b91d'

Conflicts:
module/statprof.scm
module/statprof.scm
test-suite/tests/statprof.test