Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Wed, 19 Jun 2013 02:48:33 +0000 (22:48 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Wed, 19 Jun 2013 02:48:33 +0000 (22:48 -0400)
New strategy for log_module from Franck, closes #89


Trivial merge