Brian Miller ea8a526da3 Merge branch 'master' of github.com:veganstraightedge/microformats2 ... Conflicts: lib/microformats2.rb test/test_microformats2.rb		2011-06-28 19:49:23 -07:00
..
microformats2.rb	Merge branch 'master' of github.com:veganstraightedge/microformats2	2011-06-28 19:49:23 -07:00