tree 40e6c151773896dd183355ed707018b217182170
parent cdf8985861939be2ed4c22cfd5845336a7dae10c
parent 5acb2ddd51069fe4aef6e923c35b104c616fa894
author Stian Soiland-Reyes <stain@apache.org> 1462786858 +0100
committer Stian Soiland-Reyes <stain@apache.org> 1462786858 +0100

Merge remote-tracking branch 'gale/patch-2'