Merge branch 'master' of github.com:mailru/tarantool

.gitignore

@@ -49,3 +49,9 @@ doc/www-data/*.ru.html
 doc/www-data.in/download
 doc/man/tarantool.1
 doc/man/tarantool_box.1
+connector/c/tnt/libtarantool.so.1
+connector/c/tnt/libtarantool.so.1.1
+connector/c/tntnet/libtarantoolnet.so.1
+connector/c/tntnet/libtarantoolnet.so.1.1
+connector/c/tntsql/libtarantoolsql.so.1
+connector/c/tntsql/libtarantoolsql.so.1.1

src/salloc.m

@@ -351,8 +351,8 @@ slab_stat(struct tbuf *t)
 			    (int)slab_classes[i].item_size, slabs, items, used, free);
 
 	}
-	tbuf_printf(t, "  items_used: %.2f" CRLF, (double)total_used / arena.size * 100);
-	tbuf_printf(t, "  arena_used: %.2f" CRLF, (double)arena.used / arena.size * 100);
+	tbuf_printf(t, "  items_used: %.2f%%" CRLF, (double)total_used / arena.size * 100);
+	tbuf_printf(t, "  arena_used: %.2f%%" CRLF, (double)arena.used / arena.size * 100);
 }
 
 void