CVS commit: pkgsrc/www/ikiwiki

["Amitai Schlair" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 13 21:51:41 UTC 2014

Modified Files:
        pkgsrc/www/ikiwiki: Makefile distinfo

Log Message:
Update to 3.20140613. From the changelog:

* only_committed_changes could fail in a git repository merged
  with git merge -s ours.
* Remove google from openid selector, per http://xkcd.com/1361/


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/www/ikiwiki/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/www/ikiwiki/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.