Merge branch 'master' of git://github.com/pawelz/luakit
commit5237d9fbec412d228f67a4ad23197871e7c2dfb6
authorMason Larobina <mason.larobina@gmail.com>
Fri, 6 Aug 2010 17:33:54 +0000 (7 01:33 +0800)
committerMason Larobina <mason.larobina@gmail.com>
Fri, 6 Aug 2010 17:33:54 +0000 (7 01:33 +0800)
tree62adf63e2d91b2c1c4dabdfc232f9b3fab800749
parentfbd238777bc4c7b46e4afbf5b6742a9bb7605afb
parent40c7994f37f73ae59ec90cfb9aebc475955f7243
Merge branch 'master' of git://github.com/pawelz/luakit