Merge pull request #1660 from joshuaruesweg/patch-10
authorMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:47:35 +0000 (21:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:47:35 +0000 (21:47 +0100)
commitc38a4e02f70f300a4d618c8d9517a33b7cc50132
tree9554439a37b6fc5a08a89fa8a258a30df9fed721
parent424b868760600c32193ddf3dd4752a673dab238b
parent3abc3a0d3fd247013ca44ef91e04bacd9c4cb308
Merge pull request #1660 from joshuaruesweg/patch-10

adding MODULE_SMILEY and remove defined