chiark / gitweb /
Merge remote branch 'upstream/master'
authorIvo Ugrina <ivo@iugrina.com>
Tue, 4 Oct 2011 21:45:23 +0000 (23:45 +0200)
committerIvo Ugrina <ivo@iugrina.com>
Tue, 4 Oct 2011 21:45:23 +0000 (23:45 +0200)
commit4ed05b4666dc31ceb39bebc9afd50d5226fd79a8
tree10720823e2369078c887c524b85ced5f2a2c01fd
parent90f55ac340d8cf05ad1edff9cebeada5d15338e7
parentb994c5fe6b54061b3e4a19d6c8d81269c146b4d1
Merge remote branch 'upstream/master'