From: Jess <jessicatz.fairymeadow@gmail.com>
Date: Mon, 25 Aug 2014 22:09:02 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta
X-Git-Url: https://git.yukkurigames.com/?p=mlpccg-meta.git;a=commitdiff_plain;h=0460c3c46cd330bbae7043e42a8a490662bf1e60;hp=0460c3c46cd330bbae7043e42a8a490662bf1e60

Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta

Conflicts:
	main.py
	mlpccg/CardDb.pyc
	mlpccg/Clustering.py
	mlpccg/Clustering.pyc
	mlpccg/DeckList.pyc
	static/index.html
---