diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-17 18:33:38 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-17 18:33:41 -0700 |
| commit | 616e94ebee21a211056449203d3adf3e774e069e (patch) | |
| tree | bfa4526eef5e7460ba85c761955b19b6b6a0c5c8 /grc | |
| parent | ae9e7c33d7c78da54ab0e63f82fc8c59a5ea9dfa (diff) | |
| parent | 0765dc05054e74d177d715697e3d5c89886cd838 (diff) | |
Merge branch 'maint'
* Use merge strategy -s ours to skip over release commit.
Diffstat (limited to 'grc')
0 files changed, 0 insertions, 0 deletions