Merge: Tnitter
authorJean Privat <jean@pryen.org>
Thu, 31 Jul 2014 22:55:13 +0000 (18:55 -0400)
committerJean Privat <jean@pryen.org>
Thu, 31 Jul 2014 22:55:13 +0000 (18:55 -0400)
Look only at the last 3 commits, the first part is from #620.

Almost the same version as what is running at http://tnitter.xymus.net/.

Pull-Request: #631
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>


Trivial merge