summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-10-02 00:34:01 +0200
committerJonas Smedegaard <dr@jones.dk>2010-10-02 00:34:01 +0200
commit88f35a8812d4696d412c901ae9c9ccf8db9477a4 (patch)
treecdddaf9ea17ea49248dedad18499503726f517ec
parentb8cda96bd8289092d0ee7c695c4201dd3c4c83d1 (diff)
parent97a7bf74287adb2bdde617860e49929731bdc7b9 (diff)
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved): ikiwiki_nb_admin.setup
0 files changed, 0 insertions, 0 deletions