From 5e9e68cabc72fdb01f741520db1e8f25f716f21b Mon Sep 17 00:00:00 2001
From: Yunohost Admin <webmaster@yunohost.org>
Date: Tue, 6 Jan 2015 13:24:11 +0100
Subject: [PATCH] merge

---
 apps.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps.md b/apps.md
index 46205c30..76a40306 100644
--- a/apps.md
+++ b/apps.md
@@ -129,6 +129,7 @@ The packagers will appreciate your remarks. If you test them and find issues, or
 | [Lutim](https://lut.im/) | Maniack Crudelis | <div class="inprogress"/> | https://github.com/maniackcrudelis/lutim_ynh | Anonymous image hosting service |
 | [MediaWiki](https://mediawiki.org) | ElieSauveterre | <div class="ready"/> | https://github.com/mikangali-labs/mediawiki_ynh | Wiki platform |
 | [Mumble Server](http://wiki.mumble.info/wiki/Main_Page) | matlink | <div class="inprogress"/> | https://github.com/matlink/mumbleserver_ynh | Voice chat for gaming and meeting |
+| [Munin](http://munin-monitoring.org/) | julien | <div class="ready"/> | https://github.com/julienmalik/munin_ynh | System Monitoring graphing tool |
 | [MyCryptoChat](https://github.com/HowTommy/mycryptochat) | mrtino | <div class="ready"/> | https://github.com/mrtino/mycryptochat_ynh | Encrypted chat rooms manager |
 | [OFBiz](https://ofbiz.apache.org/) | julien | <div class="inprogress"/> | https://github.com/nomakaFr/ofbiz_ynh | ERP |
 | [OpenID](http://openid.net/) | julien | <div class="inprogress"/> | https://github.com/julienmalik/openid-simplesamlphp_ynh | OpenID Identity server |