Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Thu, 16 May 2013 01:31:17 +0000 (21:31 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 16 May 2013 01:31:17 +0000 (21:31 -0400)
commitb6562d3bf379fc5937e73e6c17eb03a7cade32fb
tree0d642d5dba3052a4e000f6817f66a836c2c7bd07
parent2c8469e95e219f42c0a206454d6d0919a7447e4c
parent95615c90e2eb9a6e246709bce79bc7fedd609736
Merge remote-tracking branch 'fjoncourt/master'

Closes issues #76 and #60.