commit | 3c2bc1d63930bafa34b18b4ccc69d70776f8e60c | [log] [tgz] |
---|---|---|
author | Pierre-Luc Dion <pdion@cloudops.com> | Mon Mar 24 22:01:09 2014 -0400 |
committer | Sebastien Goasguen <runseb@gmail.com> | Tue Mar 25 08:44:14 2014 +0100 |
tree | 79ee5f5a0dc821a9ed1237e489a8c4904cb9b897 | |
parent | eebea9264e2590ed6e29165ad08efb8539d32f20 [diff] |
Closes 6#: Fixing merge issues Signed-off-by: Sebastien Goasguen <runseb@gmail.com>