Merge remote-tracking branch 'ccutrer/dev/auth_user'
authorMarko Kreen <markokr@gmail.com>
Sat, 16 Nov 2013 18:17:58 +0000 (20:17 +0200)
committerMarko Kreen <markokr@gmail.com>
Sat, 16 Nov 2013 18:17:58 +0000 (20:17 +0200)
commit9318bd30dcdc50e138085e1fc93db76a43d88a83
tree1048a9fbc172427924d512335ea0e1b740a1812b
parentf302fea894cacb0eb2ddaae3d40df082f8c1c3d8
parentfb9c2a7f25a12040ecbbcc7a21fa75e6f7387d5c
Merge remote-tracking branch 'ccutrer/dev/auth_user'
doc/config.txt
src/loader.c
src/objects.c