commit 3a3f701441966ad3d9db5ef2c10960cfc8786962 Merge: fa533e9 4163fc1 Author: Nathan Freitas nathan@freitas.net Date: Mon May 11 15:46:51 2015 -0400

Merge branch 'aelmahmoudy-build_system'

external/Makefile | 61 +++++++++++++++++++++++++++++++++++++-------- external/libevent-patch-1 | 29 +++++++++++++++++++++ external/openssl | 2 +- 3 files changed, 81 insertions(+), 11 deletions(-)