Merge: friendz, a new game for contrib
authorJean Privat <jean@pryen.org>
Tue, 22 Jul 2014 02:56:53 +0000 (22:56 -0400)
committerJean Privat <jean@pryen.org>
Tue, 22 Jul 2014 02:56:53 +0000 (22:56 -0400)
commitf5303818cc1a6d8a9659bd0ab38fee5ffda724c2
tree31d4cc962e83f33cf61a88a500f9e0c027c4748c
parent4cc4a635c5d0542b72ed34febe8c3aa46d1ba303
parente79ad689a1aebb11d1fcfe4cef8bde107a70273e
Merge: friendz, a new game for contrib

Pull-Request: #561
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>