Merge branch 'master' into jennifer/trp-devel
authorJennifer Richards <jennifer@painless-security.com>
Fri, 9 Sep 2016 18:56:31 +0000 (14:56 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Fri, 9 Sep 2016 18:56:31 +0000 (14:56 -0400)
commit1b419d2f80dd88c79565bece98dfcb591e722b3e
tree10abc0f7a078915573f00e6846031ac024160e6f
parentb0dd8d735286754d6cc6ba0b6ead7d25b0d81f15
parent4ca150b944165ff54a73ca07cf3d2b64f0f2fc9d
Merge branch 'master' into jennifer/trp-devel
gsscon/gsscon_active.c