tree 65551380898fccd6fc5ffb5b8c3db16cc17961f9
parent ccb4d7d8af5dee31957de0b8f7cfa59f9a8491a4
parent 2495cc8ae5cf0b32bcf1d37b38686ec2479becc6
author Avery Pennarun <apenwarr@gmail.com> 1357319741 -0500
committer Avery Pennarun <apenwarr@gmail.com> 1357319741 -0500

Merge branch 'master' of gh:apenwarr/afterquery

* 'master' of gh:apenwarr/afterquery:
  Add the avg() aggregate function.
  In tables, add URL formatting.
  Forgot some return types for some aggregate functions.
  Add count_nz (count nonzero) aggregation function.