commit | 48914b47b750b85016d2c2a2998b34887f5aa4c0 | [log] [tgz] |
---|---|---|
author | Nabin Hait <nabinhait@gmail.com> | Wed Aug 31 12:36:18 2016 +0530 |
committer | Nabin Hait <nabinhait@gmail.com> | Wed Aug 31 12:36:18 2016 +0530 |
tree | 1d71512aca995c2c24682b65239c60c20bee5b38 | |
parent | 566759acae05a7d96d49852767ddf6e033b9dd01 [diff] | |
parent | c0c2f75159ce5cc8bfa1bf99192c15dc9c50de82 [diff] |
Merge branch 'strixaluco-patch-2' into develop