[Chorem-commits] 02/03: Merge branch 'jsonize_wikitty' of https://git.chorem.org/chorem into jsonize_wikitty

This is an automated email from the git hooks/post-receive script. New commit to branch jsonize_wikitty in repository chorem. See http://git.chorem.org/chorem.git commit 0d78c0c1b9d968ca2c7c4b7622392225e1ecf70b Merge: c548f7f 7a81dca Author: Yannick Martel <yannick.martel@gmail.com> Date: Thu Mar 26 17:29:02 2015 +0100 Merge branch 'jsonize_wikitty' of https://git.chorem.org/chorem into jsonize_wikitty -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.