Merge branch 'oauthapi'

diff --cc boot.php
Simple merge

diff --cc images/icons/Makefile
index 6a96fb6,a39db11..ec57b94
--- 1/images/icons/Makefile
--- 2/images/icons/Makefile
+++ b/images/icons/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  IMAGES=add.png edit.png       gear.png info.png menu.png \
                notify_off.png star.png  delete.png feed.png group.png \
                lock.png notice.png notify_on.png user.png link.png \
-               play.png
 -              plugin.png
++              play.png plugin.png
  
  DESTS=10/ 16/ 22/ 48/ \
                $(addprefix 10/, $(IMAGES)) \

diff --cc include/api.php
Simple merge

diff --cc mod/settings.php
Simple merge

diff --cc view/theme/duepuntozero/style.css
Simple merge