Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

master
Joey Hess 2010-02-06 20:04:17 -05:00
commit ffc53c9f2c
1 changed files with 3 additions and 0 deletions

View File

@ -46,8 +46,11 @@ Bulleted list
* <http://ikiwiki.info/ikiwiki/formatting/> * <http://ikiwiki.info/ikiwiki/formatting/>
* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
* <http://www.gnu.org/> * <http://www.gnu.org/>
* [make money online](http://www.mooladays.com)
* [GNU](http://www.gnu.org/) * [GNU](http://www.gnu.org/)
----- -----
[[!progress percent=27]] [[!progress percent=27]]