Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index 70dd9c7de7408d994d817a1f68df33ccd5603f99..4416dc8aeef39ffe56473a6185b244f24a5eb187 100644 (file)
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -27,6 +27,7 @@ $(document).ready(function() {
         }
     }
 
+    /* rgb2hex written by R0bb13 <robertorebollo@gmail.com> */
     function rgb2hex(rgb) {
         rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
         function hex(x) {