diff LICENSE.txt @ 40:0e178b20e3ff

merge commit
author Rizmari Versfeld <rizziepit@gmail.com>
date Mon, 07 May 2012 00:27:59 +0200
parents 7fc7396aeccb
children f741bedf6670
line wrap: on
line diff