commit | 001aaa183eaa8a1092066d7d14a09cb77622b7b5 | [log] [tgz] |
---|---|---|
author | Pierre-Luc Dion <pdion@cloudops.com> | Fri Mar 21 11:13:17 2014 -0400 |
committer | Sebastien Goasguen <runseb@gmail.com> | Mon Mar 24 18:16:31 2014 -0400 |
tree | 4caff0f714b5cff8ab3cc7e9355323365dbf0fa5 | |
parent | 20dc97ee10b0347ddba71c36f6a6c201fd74aaa9 [diff] |
Closes #5: fixed merge issue Signed-off-by: Sebastien Goasguen <runseb@gmail.com>