Merge branch 'master' into angel/local_minangel/local_minjm2/develgith/angel/local_mingith/jm2/develrcz/angel/local_minrcz/jm2/devel
| commit | 2a4130f5bfaedbdbbb5ec3985e93524e110e7cae | |
| author | Jan Mandel <jan.mandel@gmail.com`> | |
| Wed, 15 Nov 2017 21:31:36 +0000 (15 14:31 -0700) | ||
| committer | Jan Mandel <jan.mandel@gmail.com`> | |
| Wed, 15 Nov 2017 21:31:36 +0000 (15 14:31 -0700) | ||
| tree | b6d84fe53c88d880341d455f4b0d64eb0d3e5a84 | treesnapshot (tar.gz zip) |
| parent | 9bba449e80bf5478a7ab1925b5123a5a7f36d812 | commitdiff |
| parent | 911417e857001afd62336af842d7886e939ba56a | commitdiff |
Merge branch 'master' into angel/local_min