]> sipb.mit.edu Git - ikiwiki.git/commit
Merge remote-tracking branch 'jonas/master'
authorJoey Hess <joey@kitenet.net>
Fri, 6 May 2011 18:31:59 +0000 (14:31 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 6 May 2011 18:31:59 +0000 (14:31 -0400)
commit18322db430bf8799af69827d0c8359a3b747e9a9
tree2a7d4424c9dd4a61903c0fef94f460fc0f432556
parente3596dbaecb69711616b7bf3b3ef363ee5929293
parent55dc24616892497a32e48ad349ebd16fac71e738
Merge remote-tracking branch 'jonas/master'