Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
authorMargaret Wasserman <mrw@painless-security.com>
Fri, 29 May 2015 20:26:17 +0000 (16:26 -0400)
committerMargaret Wasserman <mrw@painless-security.com>
Fri, 29 May 2015 20:26:17 +0000 (16:26 -0400)
commitaf8b2213bb4d53af522f7e4a2c39e1dfab842b72
tree77bafcfd6d576c10a4c3d1fb8c0b242d262de274
parent36acf11e5f48dc5537a786125766f0918725b64c
parenteb81d881ede5269e5d02702328434c9fbb6b0c58
Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb

Conflicts:
browsers/chrome/CMakeLists.txt
browsers/firefox/CMakeLists.txt
browsers/chrome/CMakeLists.txt
browsers/firefox/CMakeLists.txt