merge conflict

This commit is contained in:
Remy Sharp 2011-10-16 19:51:38 +01:00
commit a42ffcb9bd

View file

@ -7,4 +7,5 @@
"levelup": "Level Up (Scotland) Limited, http://www.thisislevelup.com",
"batu": "Batuhan İçöz, http://batu.me/1",
"gb": "George Bashi, http://georgebashi.com",
"arlo": "Arlo Carreon, http://arlocarreon.com"
}