diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-01-07 12:25:30 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-01-07 12:25:32 -0800 |
| commit | cdda4a586bef2ba7300c04641ac9fb550566f859 (patch) | |
| tree | de09dba0a8b675e84be5133a930557653657a406 | |
| parent | aaf6444f6f51319491b7bafc70c2e641a551deb6 (diff) | |
| parent | 9ce32622bdf9244b3e3df379116b3fd1c1e0fb2d (diff) | |
Merge branch 'master' into next
* Use -s ours to skip over release commits on master
0 files changed, 0 insertions, 0 deletions