Merge branch 'master' into next
- master: BibSched: motd update check dateutils: strftime improvement WebBasket: Create Basket link in the main display
Conflicts:
THANKS
modules/miscutil/lib/dateutils.py
Tibor Simko <tibor.simko@cern.ch> | Mar 18 2013, 14:45 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
4ebfdf8c8003 | Tibor Simko | Merge branch 'maint-1.1' | Mar 18 2013 | |||
8f3550e21241 | Samuele Kaplun/Tibor Simko | BibSched: motd update check | Mar 18 2013 | |||
8a876e573432 | Wojciech Ziolek/Tibor Simko | dateutils: strftime improvement | Mar 18 2013 | |||
b974452d1f16 | Nikolaos Kasioumis/Tibor Simko | WebBasket: Create Basket link in the main display | Mar 18 2013 |