commit c2078b5f209da328097b14c86a450c4ea5ac50d7
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sat Apr 30 20:37:37 2011 +0200

    Bump version to 1.15 in stable_1.X branch.
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit e0f93369509a66dfda98805a3634112e50d19dd5
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sat Apr 30 20:24:09 2011 +0200

    Add Mac OS X support: Fix regexp for Darwin
    
    Patch from Osso. Fix #3.
    
    Conflicts manually resolved in file:
    
    	pygrenouille.py
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit 3333935302683339c13fbc7a6ad9d6b22a12a3ee
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Tue Mar 22 19:43:25 2011 +0000

    Add Mac OS X support: Find the correct path for netstat
    
    Patch from Osso. Fix #4.
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit 7f6c5849a4d48263e995d40c6d1cca845483a374
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Tue Mar 22 19:38:40 2011 +0000

    Fix merge error in the previous commit
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit b42f66b43653896fb1fbceeece5cf9e518bda785
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sat Apr 30 20:18:04 2011 +0200

    Return 1 instead of 0 on fatal errors
    
    Patch from Osso. Fix #5.
    
    Conflicts manually resolved in file:
    
    	libs/__init__.py
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit 4ff130d90ce44865287e3e2834cb4b01fe58337b
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Tue Mar 22 19:27:03 2011 +0000

    Permit PyGrenouille to be lauched from anywhere
    
    Patch from Osso. Fix #2.
    
    Signed-off-by: Jérôme Benoit <jerome.benoit@grenouille.com>

commit d4d17fa0c0ec548a96b87f4fa2e3ae52426d986e
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Tue Mar 15 19:44:15 2011 +0000

    Merge r276 from trunk

commit 6f2e53e07b49541541adc199cc9832df2dec222e
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Thu Dec 23 20:00:51 2010 +0000

    Merge commit #253 from trunk

commit 6731adda0cf4f156afb8ae8cf54d256adbe6e805
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sat Sep 25 19:58:53 2010 +0000

    Remove superflous whitespace (merge commit #249 from trunk)

commit 11db89e49c09156ac1d0d9870b4d7e5bac0c54ae
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sun Feb 7 18:13:00 2010 +0000

    Make linux trafic.py executable

commit 2e6ef058cfbb684bcea16c6d4f596604e01d59a4
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sun Feb 7 18:10:10 2010 +0000

    Make contrib/openbsd4/trafic/trafic.py executable

commit 7d9b927492383f85f3e936cb05f50db3ebf800d2
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Sun Feb 7 17:33:23 2010 +0000

    Merge openbsd support in stable branch, r239

commit 5512b8de957048e3e9fb4b2c653143225883e93b
Author: Jérôme Benoit <jerome.benoit@grenouille.com>
Date:   Thu Nov 26 12:38:21 2009 +0000

    remove trailing and wrong colons in installer text message