--- Log opened Wed Mar 07 00:00:56 2012
20120307 00:02:59< fendrin_> anonymissimus: Thanks
20120307 00:04:50< vultraz> wesbot: seen Exasperation 
20120307 00:04:50< wesbot> vultraz: The person with the nick Exasperation last spoke 42d 19h ago.  41d 23h ago they were seen quitting on the channel #wesnoth with the message: Client Quit
20120307 00:05:04-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 00:05:41-!- Danceman [~Danceman@a94-132-158-220.cpe.netcabo.pt] has quit [Quit: Leaving]
20120307 00:08:59-!- Johannes13 [~Johannes@unaffiliated/johannes13] has quit [Ping timeout: 260 seconds]
20120307 00:40:27-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.]
20120307 00:42:20-!- mjs-de [~mjs-de@g224176052.adsl.alicedsl.de] has quit [Remote host closed the connection]
20120307 00:49:49-!- wesbot changed the topic of #wesnoth-dev to: 164 bugs, 329 feature requests, 14 patches | Logs: http://irclogs.wesnoth.org | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org
20120307 00:49:51< CIA-134> alarantalara * r53453 /trunk/data/core/images/terrain/mountains/cloud-desert-tile.png: replaced out of date impassible desert mountain tile with new one from vutraz
20120307 00:52:53< vultraz> :D
20120307 00:57:42< Alarantalara> fendrin or I should probably add you to the credits for editor icons
20120307 01:03:19< vultraz> Alarantalara: I was thinking, shouldn't the Dry Hills terrain be part of the desert group as well as rough?
20120307 01:03:37< vultraz> ( made a patch for it: http://pastebin.com/FuNBz57U )
20120307 01:12:39-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has quit [Read error: Connection reset by peer]
20120307 01:15:40-!- vultraz [~chatzilla@124.109.10.221] has quit [Ping timeout: 276 seconds]
20120307 01:19:50-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has joined #wesnoth-dev
20120307 01:24:01-!- anonymissimus [~chatzilla@HSI-KBW-078-042-163-105.hsi3.kabel-badenwuerttemberg.de] has quit [Quit: done building targets]
20120307 01:41:11-!- Alarantalara [~Adium@CPEc0c1c09e8055-CM00252eac6d62.cpe.net.cable.rogers.com] has quit [Quit: Leaving.]
20120307 01:46:00-!- loonybot [~loonybot@wesnoth/bot/loonybot] has quit [Remote host closed the connection]
20120307 02:13:05-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has quit [Quit: Computer has gone to sleep.]
20120307 02:36:31< AI0867> mordante: http://pastebin.com/y9VY7pAx
20120307 02:41:18-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20120307 03:06:31-!- matthiaskrgr [matthiaskr@109.73.162.119] has quit [Excess Flood]
20120307 03:07:41-!- matthiaskrgr [matthiaskr@109.73.162.119] has joined #wesnoth-dev
20120307 04:10:05-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer]
20120307 04:20:16-!- shadowm_laptop [ignacio@wesnoth/developer/shadowmaster] has quit [Quit: Lost terminal]
20120307 04:32:51-!- Ivanovic_ [~ivanovic@dtmd-4db23930.pool.mediaWays.net] has joined #wesnoth-dev
20120307 04:36:20-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 260 seconds]
20120307 04:36:46-!- Ivanovic_ is now known as Ivanovic
20120307 05:09:06-!- ancestral [~ancestral@71-34-25-87.mpls.qwest.net] has joined #wesnoth-dev
20120307 05:09:33-!- Ivanovic [~ivanovic@dtmd-4db23930.pool.mediaWays.net] has quit [Read error: Connection reset by peer]
20120307 05:09:49-!- Ivanovic [~ivanovic@dtmd-4db23930.pool.mediaWays.net] has joined #wesnoth-dev
20120307 05:17:23-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 244 seconds]
20120307 06:06:06-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has quit [Remote host closed the connection]
20120307 06:20:22-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 06:40:00-!- Elvish_Pillager [~eli@dhip-149.coburn.residences.colby.edu] has quit [Ping timeout: 260 seconds]
20120307 07:08:38-!- Gambit [~gambit@wesnoth/developer/grickit] has quit [Read error: Connection reset by peer]
20120307 07:11:09< CIA-134> espreon * r53454 /trunk/data/advanced_preferences.cfg: Made translation mark spacing consistent.
20120307 07:11:27< CIA-134> espreon * r53455 /trunk/data/core/images/terrain/impassable-editor.png: Set svn:mime-type.
20120307 07:17:09< CIA-134> espreon * r53456 /trunk/src/savegame.cpp: Stripped trailing spaces.
20120307 07:18:34-!- Gallaecio [~quassel@84.120.113.193.dyn.user.ono.com] has joined #wesnoth-dev
20120307 07:21:00-!- Ivanovic [~ivanovic@dtmd-4db23930.pool.mediaWays.net] has quit [Changing host]
20120307 07:21:00-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev
20120307 07:31:13-!- vultraz [~chatzilla@124.109.10.221] has joined #wesnoth-dev
20120307 07:33:43< Ivanovic> moin
20120307 07:41:27-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20120307 07:42:28-!- ancestral [~ancestral@71-34-25-87.mpls.qwest.net] has quit [Quit: i go sleeps kthxbai]
20120307 08:18:56-!- PolarPanda [~quassel@unaffiliated/peterporty] has quit [Remote host closed the connection]
20120307 08:33:03-!- Gallaecio [~quassel@84.120.113.193.dyn.user.ono.com] has quit [Remote host closed the connection]
20120307 09:05:54-!- mihaineacsu [~Cookie@p16.eregie.pub.ro] has joined #wesnoth-dev
20120307 09:31:55-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has joined #wesnoth-dev
20120307 09:56:04-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving]
20120307 10:03:36-!- loonybot [~loonybot@wesnoth/bot/loonybot] has joined #wesnoth-dev
20120307 10:06:51-!- MeccaGod [majs@host189-199.bornet.net] has joined #wesnoth-dev
20120307 10:39:05-!- ancestral [~ancestral@71-34-25-87.mpls.qwest.net] has joined #wesnoth-dev
20120307 10:39:20-!- ancestral [~ancestral@71-34-25-87.mpls.qwest.net] has quit [Client Quit]
20120307 10:43:26-!- mjs-de [~mjs-de@g224176054.adsl.alicedsl.de] has joined #wesnoth-dev
20120307 11:25:24-!- horon [~horon@nttkyo322045.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has joined #wesnoth-dev
20120307 12:08:10-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has quit [Remote host closed the connection]
20120307 12:10:41-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has joined #wesnoth-dev
20120307 12:52:39-!- enchilado [~enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 245 seconds]
20120307 13:24:00-!- stikonas [~gentoo@bcm-131-111-216-70.girton.cam.ac.uk] has joined #wesnoth-dev
20120307 13:24:01-!- stikonas [~gentoo@bcm-131-111-216-70.girton.cam.ac.uk] has quit [Changing host]
20120307 13:24:01-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20120307 13:30:34-!- Johannes13 [~Johannes@p4FDEBECF.dip.t-dialin.net] has joined #wesnoth-dev
20120307 13:30:35-!- Johannes13 [~Johannes@p4FDEBECF.dip.t-dialin.net] has quit [Changing host]
20120307 13:30:35-!- Johannes13 [~Johannes@unaffiliated/johannes13] has joined #wesnoth-dev
20120307 13:58:33-!- noy [~Noy@wesnoth/developer/noy] has quit [Read error: Connection reset by peer]
20120307 13:58:41-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 14:00:29-!- negusnyul [~negusnyul@dsl4E5CCA65.pool.t-online.hu] has joined #wesnoth-dev
20120307 14:05:33-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20120307 14:20:47< CIA-134> elias * r53457 /trunk/data/tools/ (unit_tree/overview.py wmlunits): [wmlunits] converted error log to html
20120307 14:22:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20120307 14:24:15< CIA-134> elias * r53458 /branches/1.10/data/tools/ (6 files in 2 dirs): [wmlunits] backported to 1.10
20120307 14:24:49-!- stikonas [~and@bcm-131-111-216-70.girton.cam.ac.uk] has joined #wesnoth-dev
20120307 14:24:49-!- stikonas [~and@bcm-131-111-216-70.girton.cam.ac.uk] has quit [Changing host]
20120307 14:24:49-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20120307 14:25:22-!- Elvish_Pillager [~eli@dhip-149.coburn.residences.colby.edu] has joined #wesnoth-dev
20120307 14:40:25< CIA-134> elias * r53459 /trunk/data/tools/unit_tree/overview.py: [wmlunits] exclude tempfile paths from error messages
20120307 14:51:49-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20120307 15:09:08-!- Crab_ [Crab_@wesnoth/developer/crab] has joined #wesnoth-dev
20120307 15:16:45-!- Gambit [~gambit@wesnoth/developer/grickit] has joined #wesnoth-dev
20120307 15:48:35-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has joined #wesnoth-dev
20120307 15:51:25-!- horon [~horon@nttkyo322045.tkyo.nt.ngn2.ppp.infoweb.ne.jp] has quit [Quit: Leaving...]
20120307 16:03:00-!- MeccaGod [majs@host189-199.bornet.net] has quit []
20120307 16:04:44-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20120307 16:25:57-!- stikonas [~and@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20120307 16:46:55-!- mihaineacsu [~Cookie@p16.eregie.pub.ro] has quit [Quit: Leaving...]
20120307 16:53:25-!- the_new_lipk [~lipk@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20120307 16:54:48-!- PolarPanda [~quassel@unaffiliated/peterporty] has joined #wesnoth-dev
20120307 17:04:10-!- stikonas [~and@bcm-131-111-216-70.girton.cam.ac.uk] has joined #wesnoth-dev
20120307 17:04:10-!- stikonas [~and@bcm-131-111-216-70.girton.cam.ac.uk] has quit [Changing host]
20120307 17:04:10-!- stikonas [~and@wesnoth/translator/stikonas] has joined #wesnoth-dev
20120307 17:06:37-!- Upthorn [~ogmar@108-85-91-228.lightspeed.frokca.sbcglobal.net] has quit [Ping timeout: 276 seconds]
20120307 17:12:43-!- Crendgrim [~crend@77-22-112-72-dynip.superkabel.de] has joined #wesnoth-dev
20120307 17:42:53-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev
20120307 17:45:35-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has quit [Ping timeout: 260 seconds]
20120307 17:49:39-!- Aethaeryn [~Michael@wesnoth/umc-dev/developer/aethaeryn] has joined #wesnoth-dev
20120307 17:59:37-!- the_new_lipk [~lipk@host-91-147-212-174.biatv.hu] has left #wesnoth-dev ["...and so lipk disappears in the mist..."]
20120307 18:18:37-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has quit [Quit: Computer has gone to sleep.]
20120307 18:35:58-!- negusnyul_ [~negusnyul@dsl4E5CCA65.pool.t-online.hu] has joined #wesnoth-dev
20120307 18:37:27-!- negusnyul [~negusnyul@dsl4E5CCA65.pool.t-online.hu] has quit [Read error: Connection reset by peer]
20120307 18:38:36-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 18:46:39< CIA-134> elias * r53460 /trunk/data/tools/unit_tree/ (html_output.py style.css): [wmlunits] For units without a portrait use a scaled base image.
20120307 18:52:49-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20120307 19:02:44-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev
20120307 19:12:40-!- markus_ [~mjs-de@e182034244.adsl.alicedsl.de] has joined #wesnoth-dev
20120307 19:13:01-!- Gallaecio [~quassel@84.120.113.193.dyn.user.ono.com] has joined #wesnoth-dev
20120307 19:13:32-!- the_new_lipk [~lipk@host-91-147-212-174.biatv.hu] has joined #wesnoth-dev
20120307 19:16:37-!- mjs-de [~mjs-de@g224176054.adsl.alicedsl.de] has quit [Ping timeout: 276 seconds]
20120307 19:17:53-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20120307 19:22:31-!- markus_ is now known as mjs-de
20120307 19:40:56-!- Danceman [~Danceman@a94-132-158-220.cpe.netcabo.pt] has joined #wesnoth-dev
20120307 19:41:03-!- EdB [~edb@tss37-1-89-82-194-231.dsl.sta.abo.bbox.fr] has joined #wesnoth-dev
20120307 19:41:55-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 19:51:43-!- timotei [~timotei@188.24.0.181] has joined #wesnoth-dev
20120307 19:51:44-!- timotei [~timotei@188.24.0.181] has quit [Changing host]
20120307 19:51:44-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev
20120307 20:02:31-!- anonymissimus [~chatzilla@HSI-KBW-078-042-163-105.hsi3.kabel-badenwuerttemberg.de] has joined #wesnoth-dev
20120307 20:12:07-!- EdB [~edb@tss37-1-89-82-194-231.dsl.sta.abo.bbox.fr] has quit [Quit: Konversation terminated!]
20120307 20:15:13-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has quit [Read error: Connection reset by peer]
20120307 20:16:52-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has joined #wesnoth-dev
20120307 20:18:40-!- vultraz [~chatzilla@124.109.10.221] has quit [Ping timeout: 272 seconds]
20120307 20:22:49< boucman> to remove a map, I just have to remove the .map and .cfg, or is there something else ?
20120307 20:23:23< CIA-134> boucman * r53461 /trunk/data/multiplayer/scenarios/4p_Lagoon.cfg: remove 4p_Lagoon on Doc Paterson's request
20120307 20:23:40< Espreon> boucman: That should be it.
20120307 20:23:56< CIA-134> boucman * r53462 /trunk/data/multiplayer/maps/4p_Lagoon.map: forgot a file, I still have stuff to learn about svn
20120307 20:24:10< boucman> thx
20120307 20:24:16< Espreon> Yup.
20120307 20:36:22< CIA-134> anonymissimus * r53463 /trunk/data/lua/wml/objectives.lua: 
20120307 20:36:22< CIA-134> introduce inline SSF support in [objectives]
20120307 20:36:22< CIA-134> No deprecation needed since it defaulted to the 'default
20120307 20:36:22< CIA-134> objectives' already. They are used for a side in case that that side
20120307 20:36:22< CIA-134> doesn't have side specific objctives set. Use a SSF which matches
20120307 20:36:23< CIA-134> no sides or all sides to set the default objectives, if a subset
20120307 20:36:24< CIA-134> of all sides match, the side specific objectives for these are set.
20120307 20:36:36< CIA-134> anonymissimus * r53464 /trunk/data/lua/wml/objectives.lua: introduce inline SSF support in [show_objectives]
20120307 20:37:08< CIA-134> anonymissimus * r53465 /trunk/changelog: 
20120307 20:37:08< CIA-134> changelog update
20120307 20:37:08< CIA-134> Espreon owes me a cookie.
20120307 20:37:26 * Espreon eats a cookie in front of anonymissimus 
20120307 20:40:39< boucman> zookeeper: around ?
20120307 20:42:04< zookeeper> boucman, yep
20120307 20:42:21< zookeeper> nope, nothing else in need of removal, i think
20120307 20:43:42< boucman> Espreon, shadowm too : could you have a look at the proposed approch at https://gna.org/patch/?3176 ? it sounds sane to me but you are the real users
20120307 20:48:52< Espreon> boucman: As long as I can force things to be refogged, I'm fine with it, I guess.
20120307 20:49:09< boucman> ok, so it should be fine
20120307 20:49:46< Espreon> Well, assuming I don't need to write a book to do it, that is.
20120307 20:50:11< boucman> actually IIUC it will be closer in the way it is handled to the invisible units you were using so far
20120307 20:51:44< Espreon> Really now?
20120307 20:52:17< boucman> well that's how I understand his last comment, but it's not very clear
20120307 20:56:03< Espreon> boucman: Then ask for clarification
20120307 20:56:12< boucman> good point
20120307 20:56:14< boucman> :P
20120307 20:59:40-!- worduk [~jon@77.76.205.90] has quit [Read error: Connection timed out]
20120307 21:00:36-!- worduk [~jon@77.76.205.90] has joined #wesnoth-dev
20120307 21:07:25< anonymissimus> uh oh, poking into the shroud/fog/sighted beehive..
20120307 21:09:17< anonymissimus> even if you think you finally consider all aspects...you do not!! :)
20120307 21:15:39-!- enchilado [~enchilado@ppp118-208-173-59.lns20.bne4.internode.on.net] has joined #wesnoth-dev
20120307 21:17:01-!- enchilado [~enchilado@ppp118-208-173-59.lns20.bne4.internode.on.net] has quit [Changing host]
20120307 21:17:01-!- enchilado [~enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev
20120307 21:29:37-!- the_new_lipk [~lipk@host-91-147-212-174.biatv.hu] has quit [Remote host closed the connection]
20120307 21:48:06-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20120307 21:53:26-!- negusnyul_ [~negusnyul@dsl4E5CCA65.pool.t-online.hu] has quit [Quit: Konversation terminated!]
20120307 22:06:20-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has quit [Quit: oldtopman has left the house]
20120307 22:09:11-!- oldtopman [~oldtopman@unaffiliated/oldtopman] has joined #wesnoth-dev
20120307 22:10:25-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 260 seconds]
20120307 22:10:47-!- Samual_ [diotecktec@c-71-195-88-69.hsd1.pa.comcast.net] has quit [Ping timeout: 265 seconds]
20120307 22:12:01-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20120307 22:14:55-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Quit: SIGKILL]
20120307 22:16:05-!- Samual [diotecktec@c-71-195-88-69.hsd1.pa.comcast.net] has joined #wesnoth-dev
20120307 22:16:47-!- Appleman1234 [~Appleman1@ppp59-167-222-56.qld.adsl.internode.on.net] has quit [Remote host closed the connection]
20120307 22:31:49-!- Ivanovic [~ivanovic@dtmd-4db23930.pool.mediaWays.net] has joined #wesnoth-dev
20120307 22:41:51-!- Samual_ [diotecktec@c-71-195-88-69.hsd1.pa.comcast.net] has joined #wesnoth-dev
20120307 22:43:46< boucman> anonymissimus: we got someone who's attempting to do something, let's not waste it :)
20120307 22:43:56< boucman> and we are early in 1.11, the best possible time
20120307 22:45:14-!- Samual [diotecktec@c-71-195-88-69.hsd1.pa.comcast.net] has quit [Ping timeout: 260 seconds]
20120307 22:45:51< Espreon> Indeed, indeed.
20120307 22:50:09-!- Crendgrim [~crend@77-22-112-72-dynip.superkabel.de] has quit [Quit: Konversation terminated!]
20120307 23:02:24-!- Gallaecio [~quassel@84.120.113.193.dyn.user.ono.com] has quit [Remote host closed the connection]
20120307 23:04:01-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 246 seconds]
20120307 23:13:22-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has quit [Ping timeout: 260 seconds]
20120307 23:15:13-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20120307 23:24:05< anonymissimus> boucman: well yeah; and I hope you keep an eye on this bug which was supposedly introduced by the save_index refactoring: http://gna.org/bugs/?19503
20120307 23:25:29< anonymissimus> so that not many commits that would conflict in case of a revert are made just in case the patch submitter disappears and that bug adds to the stack of "none knows what to do with it or how to fix it" - bugs ;)
20120307 23:26:31< boucman> hehe
20120307 23:26:39< boucman> well, jamit seems to have some good clues 
20120307 23:27:49< Espreon> We just need to hunt down Oleg and make him fix it.
20120307 23:28:01< Espreon> ... he should be in western Europe now.
20120307 23:30:29< Espreon> boucman: You're probably the closest to him... so go find him, kidnap him, and make him fix it.
20120307 23:30:43< anonymissimus> I also would like to not that it's not very good karma if several bugs or bug fixes appear related to some patch/commit soon after it happened
20120307 23:30:47< boucman> sure thing, 
20120307 23:30:48< boucman> :)
20120307 23:31:06< Espreon> He's probably somewhere on the Iberian Peninsula.
20120307 23:31:30-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has quit [Ping timeout: 260 seconds]
20120307 23:32:09-!- crimson_penguin [~ben@wesnoth/developer/crimsonpenguin] has joined #wesnoth-dev
20120307 23:48:57-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Quit: Leaving.]
20120307 23:56:56-!- Danceman [~Danceman@a94-132-158-220.cpe.netcabo.pt] has quit [Quit: Leaving]
20120307 23:57:30-!- Upth [~ogmar@69.62.144.56] has joined #wesnoth-dev
20120307 23:57:30-!- Upth is now known as Upthorn
--- Log closed Thu Mar 08 00:00:15 2012