Generated from dcfb3ebc64b9757a40175bd38ee8f1bf52527dde

tree fb52b66679d12bbf07b719e320cc171ef6a71943
parent 99c598d604cf284396cf2a83e3d6b56417906209
parent 346fd1ed07fab81264ac2c0e888abbbac26def86
author Martin Atkins <mart@degeneration.co.uk> 1416176788 -0800
committer Martin Atkins <mart@degeneration.co.uk> 1416176788 -0800

Merge branch 'angulardirectives'